Refactor and add some tests

Author: willcl-ark

Cargo.lock

@@ -12,15 +12,13 @@ hwloc = "0.5.0"
 indicatif = "0.17.11"
 libc = "0.2"
 log = "0.4.26"
-object_store = { version = "0.11.2", features = ["aws"] }
+# object_store = { version = "0.11.2", features = ["aws"] }
 rand = "0.9.0"
 reqwest = { version = "0.12.14", default-features = false, features = ["blocking", "rustls-tls"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.138"
 serde_yaml = "0.9.34"
-serial_test = "3.2.0"
 shellexpand = "3.1.0"
 sysinfo = "0.33.1"
-tempfile = "3.17.1"
-thiserror = "2.0.11"
+tempfile = "3.10.1"
 url = "2.5.4"

Cargo.toml

@@ -32,8 +32,8 @@ global:
 
   # Path to source code (required).
   # Can point to a local or online fork of bitcoin/bitcoin.
-  # source: $HOME/src/core/bitcoin
-  source: https://github.com/bitcoin/bitcoin
+  source: $HOME/src/core/bitcoin
+  # source: https://github.com/bitcoin/bitcoin
 
   # The directory binaries will be built into
   scratch: $HOME/.local/state/benchkit/scratch
@@ -74,18 +74,18 @@ benchmarks:
           # A list of values to substitute in.
           values: ["450", "32000"]
 
-  - name: "signet no assumeutxo"
-    network: signet
-    connect: 127.0.0.1:39333
-    scripts:
-      # Use a custom prepare script which does not do assumeutxo syncing
-      # for a full IBD benchmark to stopheight
-      prepare: ./scripts/prepare-noassumeutxo.sh
-    benchmark:
-      command: "bitcoind -dbcache={dbcache} -stopatheight=170000"
-      profile_interval: 1
-      warmup: 0
-      runs: 1
-      parameter_lists:
-        - var: dbcache
-          values: ["32000"]
+  # - name: "signet no assumeutxo"
+  #   network: signet
+  #   connect: 127.0.0.1:39333
+  #   scripts:
+  #     # Use a custom prepare script which does not do assumeutxo syncing
+  #     # for a full IBD benchmark to stopheight
+  #     prepare: ./scripts/prepare-noassumeutxo.sh
+  #   benchmark:
+  #     command: "bitcoind -dbcache={dbcache} -stopatheight=170000"
+  #     profile_interval: 1
+  #     warmup: 0
+  #     runs: 1
+  #     parameter_lists:
+  #       - var: dbcache
+  #         values: ["32000"]

benchmark.yml

@@ -42,6 +42,7 @@
               hwloc
               libevent
               rust-bin.stable.latest.default
+              # rust-bin.nightly.latest.default
               sqlite
               stress
             ];