make DumpWitnessCommand properly accessible programmatically (#80)

Author: omerfirmak

Cargo.toml

@@ -76,7 +76,7 @@ rustc-hash = "2.1"
 thiserror = "1.0"
 tiny-keccak = "2.0"
 tower = "0.5"
-url = "2.5"
+url = ">=2.5.3"
 
 # binary dependencies
 anyhow = "1.0"
@@ -109,6 +109,7 @@ sbv-kv = { path = "crates/kv" }
 sbv-primitives = { path = "crates/primitives" }
 sbv-trie = { path = "crates/trie" }
 sbv-helpers = { path = "crates/helpers" }
+sbv-utils = { path = "crates/utils" }
 
 [workspace.dependencies.revm]
 git = "https://github.com/scroll-tech/revm"

crates/utils/Cargo.toml

@@ -28,4 +28,4 @@ url.workspace = true
 sbv.workspace = true
 
 [features]
-scroll = []
+scroll = ["sbv/scroll"]

crates/utils/src/commands/mod.rs

@@ -1,8 +1,8 @@
 use clap::Subcommand;
 
-mod witness;
+pub mod witness;
 
-#[derive(Subcommand)]
+#[derive(Debug, Subcommand)]
 pub enum Commands {
     #[command(subcommand, about = "Witness commands")]
     Witness(witness::WitnessCommands),

crates/utils/src/commands/witness/dump.rs

@@ -19,52 +19,52 @@ use sbv::primitives::{
 use std::{path::PathBuf, time::Instant};
 use url::Url;
 
-#[derive(Args)]
+#[derive(Debug, Args)]
 pub struct DumpWitnessCommand {
     #[arg(
         long,
         help = "URL to the RPC server",
         default_value = "http://localhost:8545"
     )]
-    rpc: Url,
+    pub rpc: Url,
     #[arg(long, help = "Block number")]
-    block: u64,
+    pub block: u64,
     #[arg(long, help = "Ancestor blocks", default_value_t = 256)]
-    ancestors: u64,
+    pub ancestors: u64,
     #[arg(long, help = "Output directory", default_value_os_t = std::env::current_dir().unwrap())]
-    out_dir: PathBuf,
+    pub out_dir: PathBuf,
     #[arg(long, help = "Output json")]
-    json: bool,
+    pub json: bool,
     #[arg(long, help = "Output rkyv")]
-    rkyv: bool,
+    pub rkyv: bool,
 
     // Concurrency Limit
     #[arg(
         long,
         help = "Concurrency Limit: maximum number of concurrent requests",
         default_value = "10"
     )]
-    max_concurrency: usize,
+    pub max_concurrency: usize,
 
     // Retry parameters
     #[arg(
         long,
         help = "Retry Backoff: maximum number of retries",
         default_value = "10"
     )]
-    max_retry: u32,
+    pub max_retry: u32,
     #[arg(
         long,
         help = "Retry Backoff: backoff duration in milliseconds",
         default_value = "100"
     )]
-    backoff: u64,
+    pub backoff: u64,
     #[arg(
         long,
         help = "Retry Backoff: compute units per second",
         default_value = "100"
     )]
-    cups: u64,
+    pub cups: u64,
 }
 
 impl DumpWitnessCommand {

crates/utils/src/commands/witness/mod.rs

@@ -1,9 +1,9 @@
 use clap::Subcommand;
 
-mod dump;
-mod rkyv_convert;
+pub mod dump;
+pub mod rkyv_convert;
 
-#[derive(Subcommand)]
+#[derive(Debug, Subcommand)]
 pub enum WitnessCommands {
     #[command(about = "Dump a witness from reth RPC")]
     Dump(dump::DumpWitnessCommand),

crates/utils/src/commands/witness/rkyv_convert.rs

@@ -3,7 +3,7 @@ use rkyv::{rancor, vec::ArchivedVec};
 use sbv::primitives::types::{ArchivedBlockWitness, BlockWitness};
 use std::path::PathBuf;
 
-#[derive(Args)]
+#[derive(Debug, Args)]
 pub struct RkyvConvertCommand {
     /// Path to the witness json file
     witnesses: Vec<PathBuf>,

crates/utils/src/lib.rs

@@ -0,0 +1,6 @@
+//! This crate allows programmatical access to CLI commands
+
+#[doc(hidden)]
+pub mod commands;
+#[doc(hidden)]
+pub mod helpers;