finish it

Signed-off-by: tmel <[email protected]>

Author: tmel

crates/cli/commands/src/import_core.rs

@@ -40,10 +40,6 @@ pub struct ImportConfig {
 /// Result of an import operation.
 #[derive(Debug)]
 pub struct ImportResult {
-    /// Total number of blocks present in the database before the import started.
-    pub starting_imported_blocks: usize,
-    /// Total number of transactions present in the database before the import started.
-    pub starting_imported_txns: usize,
     /// Total number of blocks decoded from the file.
     pub total_decoded_blocks: usize,
     /// Total number of transactions decoded from the file.
@@ -57,13 +53,8 @@ pub struct ImportResult {
 impl ImportResult {
     /// Returns true if all blocks and transactions were imported successfully.
     pub fn is_complete(&self) -> bool {
-        // Compare deltas so this works for fresh DBs (genesis present) and non-empty DBs alike.
-        self.total_imported_blocks
-            .saturating_sub(self.starting_imported_blocks)
-            .saturating_eq(self.total_decoded_blocks) &&
-            self.total_imported_txns
-                .saturating_sub(self.starting_imported_txns)
-                .saturating_eq(self.total_decoded_txns)
+        self.total_decoded_blocks == self.total_imported_blocks &&
+            self.total_decoded_txns == self.total_imported_txns
     }
 }
 
@@ -100,8 +91,9 @@ where
     let mut reader = ChunkedFileReader::new(path, import_config.chunk_len).await?;
 
     let provider = provider_factory.provider()?;
-    let starting_imported_blocks = provider.tx_ref().entries::<tables::HeaderNumbers>()?;
-    let starting_imported_txns = provider.tx_ref().entries::<tables::TransactionHashNumbers>()?;
+    let init_blocks = provider.tx_ref().entries::<tables::HeaderNumbers>()?;
+    let init_txns = provider.tx_ref().entries::<tables::TransactionHashNumbers>()?;
+    drop(provider);
 
     let mut total_decoded_blocks = 0;
     let mut total_decoded_txns = 0;
@@ -139,7 +131,7 @@ where
         debug!(target: "reth::import", ?tip, "Tip manually set");
 
         let latest_block_number =
-            provider.get_stage_checkpoint(StageId::Finish)?.map(|ch| ch.block_number);
+            provider_factory.get_stage_checkpoint(StageId::Finish)?.map(|ch| ch.block_number);
         tokio::spawn(reth_node_events::node::handle_events(None, latest_block_number, events));
 
         // Run pipeline
@@ -157,12 +149,12 @@ where
             .expect("should have genesis");
     }
 
-    let total_imported_blocks = provider.tx_ref().entries::<tables::HeaderNumbers>()?;
-    let total_imported_txns = provider.tx_ref().entries::<tables::TransactionHashNumbers>()?;
+    let provider = provider_factory.provider()?;
+    let total_imported_blocks = provider.tx_ref().entries::<tables::HeaderNumbers>()? - init_blocks;
+    let total_imported_txns =
+        provider.tx_ref().entries::<tables::TransactionHashNumbers>()? - init_txns;
 
     let result = ImportResult {
-        starting_imported_blocks,
-        starting_imported_txns,
         total_decoded_blocks,
         total_decoded_txns,
         total_imported_blocks,