Nits

subcoin-project · Dec 17, 2024 · 6c278b4 · 6c278b4
1 parent c5d63a2
commit 6c278b4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/subcoin-node/src/commands/blockchain/dump_txout_set.rs b/crates/subcoin-node/src/commands/blockchain/dump_txout_set.rs
@@ -58,7 +58,7 @@ impl DumpTxOutSetCmd {
             let utxo_set_size = fetch_utxo_set_at(&client, height)?.2.count() as u64;
 
             println!(
-                "Exporting UTXO set (utxo_set_size) at #{block_number},{bitcoin_block_hash} to binary file: {}",
+                "Exporting UTXO set ({utxo_set_size}) at #{block_number},{bitcoin_block_hash} to binary file: {}",
                 path.display()
             );
 

diff --git a/crates/subcoin-service/Cargo.toml b/crates/subcoin-service/Cargo.toml
@@ -28,8 +28,6 @@ sc-network = { workspace = true }
 sc-network-sync = { workspace = true }
 sc-rpc = { workspace = true }
 sc-rpc-api = { workspace = true }
-# `test-helpers` for the exposed Client type.
-# sc-service = { workspace = true, features = ["test-helpers"], default-features = false }
 sc-service = { workspace = true, default-features = false }
 sc-storage-monitor = { workspace = true }
 sc-sysinfo = { workspace = true }

diff --git a/crates/subcoin-snapcake/src/snapshot_processor.rs b/crates/subcoin-snapcake/src/snapshot_processor.rs
@@ -119,34 +119,24 @@ impl SnapshotStore {
         utxos_count: u64,
     ) -> std::io::Result<()> {
         match self {
-            Self::InMem(list) => {
-                let utxos = std::mem::take(list);
-
-                snapshot_generator.generate_snapshot_in_mem(
-                    target_bitcoin_block_hash,
-                    utxos_count as u64,
-                    utxos,
-                )?;
-            }
-            Self::Csv(path) => {
-                generate_from_csv(
-                    path,
-                    snapshot_generator,
-                    target_bitcoin_block_hash,
-                    utxos_count,
-                )?;
-            }
-            Self::Rocksdb(db) => {
-                generate_from_rocksdb(
-                    db,
-                    snapshot_generator,
-                    target_bitcoin_block_hash,
-                    utxos_count,
-                )?;
-            }
+            Self::InMem(list) => snapshot_generator.generate_snapshot_in_mem(
+                target_bitcoin_block_hash,
+                utxos_count as u64,
+                std::mem::take(list),
+            ),
+            Self::Csv(path) => generate_from_csv(
+                path,
+                snapshot_generator,
+                target_bitcoin_block_hash,
+                utxos_count,
+            ),
+            Self::Rocksdb(db) => generate_from_rocksdb(
+                db,
+                snapshot_generator,
+                target_bitcoin_block_hash,
+                utxos_count,
+            ),
         }
-
-        Ok(())
     }
 }
 
@@ -229,7 +219,7 @@ fn generate_from_rocksdb(
     let mut written = 0;
     let mut last_progress_update_time = Instant::now();
 
-    snapshot_generator.write_snapshot_metadata(bitcoin_block_hash, utxos_count)?;
+    snapshot_generator.write_metadata(bitcoin_block_hash, utxos_count)?;
 
     for entry in db.iterator(rocksdb::IteratorMode::Start) {
         let (key, value) = entry.unwrap();
@@ -358,3 +348,4 @@ impl SnapshotProcessor {
             .expect("Failed to write UTXO set snapshot");
     }
 }
+
diff --git a/crates/subcoin-utxo-snapshot/Cargo.toml b/crates/subcoin-utxo-snapshot/Cargo.toml
@@ -11,8 +11,6 @@ bitcoin = { workspace = true, features = ["serde"] }
 serde = { workspace = true }
 subcoin-primitives = { workspace = true }
 txoutset = { workspace = true }
-tracing = { workspace = true }
-thiserror = { workspace = true }
 
 [dev-dependencies]
 fastrand = { workspace = true }

diff --git a/crates/subcoin-utxo-snapshot/src/lib.rs b/crates/subcoin-utxo-snapshot/src/lib.rs
@@ -232,7 +232,7 @@ impl UtxoSnapshotGenerator {
     }
 
     /// Writes the metadata of snapshot.
-    pub fn write_snapshot_metadata(
+    pub fn write_metadata(
         &mut self,
         bitcoin_block_hash: BlockHash,
         coins_count: u64,
@@ -310,6 +310,7 @@ fn generate_snapshot_in_mem_inner<W: std::io::Write>(
     Ok(())
 }
 
+///
 pub fn write_coins<W: std::io::Write>(
     writer: &mut W,
     txid: bitcoin::Txid,
@@ -351,3 +352,4 @@ fn serialize_coin<W: std::io::Write>(writer: &mut W, coin: Coin) -> std::io::Res
 
     Ok(())
 }
+