From 836bce2d549e4309ec652d4ec3beae87ba53b1bd Mon Sep 17 00:00:00 2001 From: Bernhard Schuster Date: Fri, 13 Mar 2026 13:13:54 +0100 Subject: [PATCH 1/2] fix/clap: duplicate names, add regression tests --- bin/node/src/main.rs | 2 ++ bin/node/src/tests.rs | 46 ++++++++++++++++++++++++++++++++ crates/utils/src/clap/rocksdb.rs | 4 +++ 3 files changed, 52 insertions(+) create mode 100644 bin/node/src/tests.rs diff --git a/bin/node/src/main.rs b/bin/node/src/main.rs index 2a7ce73359..72582382bb 100644 --- a/bin/node/src/main.rs +++ b/bin/node/src/main.rs @@ -6,6 +6,8 @@ use clap::{Parser, Subcommand}; use miden_node_utils::logging::OpenTelemetry; mod commands; +#[cfg(test)] +mod tests; // COMMANDS // ================================================================================================ diff --git a/bin/node/src/tests.rs b/bin/node/src/tests.rs new file mode 100644 index 0000000000..556a2be7fa --- /dev/null +++ b/bin/node/src/tests.rs @@ -0,0 +1,46 @@ +use clap::Parser; + +use crate::Cli; + +fn parse(args: &[&str]) -> Result { + Cli::try_parse_from(std::iter::once("miden-node").chain(args.iter().copied())) +} + +#[test] +fn store_bootstrap_parses() { + let _ = parse(&["store", "bootstrap"]); +} + +#[test] +fn block_producer_start_parses() { + let _ = parse(&[ + "block-producer", + "start", + ]); +} + +#[test] +fn validator_bootstrap_parses() { + let _ = parse(&[ + "validator", + "bootstrap", + ]); +} + +#[test] +fn validator_start_parses() { + let _ = parse(&["validator", "start"]); +} + +#[test] +fn bundled_bootstrap_parses() { + let _ = parse(&[ + "bundled", + "bootstrap", + ]); +} + +#[test] +fn bundled_start_parses() { + let _ = parse(&["bundled", "start"]); +} \ No newline at end of file diff --git a/crates/utils/src/clap/rocksdb.rs b/crates/utils/src/clap/rocksdb.rs index 9b752205d2..572e5b1cf7 100644 --- a/crates/utils/src/clap/rocksdb.rs +++ b/crates/utils/src/clap/rocksdb.rs @@ -12,12 +12,14 @@ pub(crate) const BENCH_ROCKSDB_MAX_OPEN_FDS: i32 = 512; #[derive(clap::Args, Clone, Debug, PartialEq, Eq)] pub struct NullifierTreeRocksDbOptions { #[arg( + id = "nullifier_tree_rocksdb_max_open_fds", long = "nullifier_tree.rocksdb.max_open_fds", default_value_t = DEFAULT_ROCKSDB_MAX_OPEN_FDS, value_name = "NULLIFIER_TREE__ROCKSDB__MAX_OPEN_FDS" )] pub max_open_fds: i32, #[arg( + id = "nullifier_tree_rocksdb_max_cache_size", long = "nullifier_tree.rocksdb.max_cache_size", default_value_t = DEFAULT_ROCKSDB_CACHE_SIZE, value_name = "NULLIFIER_TREE__ROCKSDB__CACHE_SIZE" @@ -35,12 +37,14 @@ impl Default for NullifierTreeRocksDbOptions { #[derive(clap::Args, Clone, Debug, PartialEq, Eq)] pub struct AccountTreeRocksDbOptions { #[arg( + id = "account_tree_rocksdb_max_open_fds", long = "account_tree.rocksdb.max_open_fds", default_value_t = DEFAULT_ROCKSDB_MAX_OPEN_FDS, value_name = "ACCOUNT_TREE__ROCKSDB__MAX_OPEN_FDS" )] pub max_open_fds: i32, #[arg( + id = "account_tree_rocksdb_max_cache_size", long = "account_tree.rocksdb.max_cache_size", default_value_t = DEFAULT_ROCKSDB_CACHE_SIZE, value_name = "ACCOUNT_TREE__ROCKSDB__CACHE_SIZE" From a7d5e254eb4d869b1b7b87c567d49c1c36ac986d Mon Sep 17 00:00:00 2001 From: Bernhard Schuster Date: Fri, 13 Mar 2026 13:31:49 +0100 Subject: [PATCH 2/2] fmt --- bin/node/src/tests.rs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/bin/node/src/tests.rs b/bin/node/src/tests.rs index 556a2be7fa..f4968f79fd 100644 --- a/bin/node/src/tests.rs +++ b/bin/node/src/tests.rs @@ -13,18 +13,12 @@ fn store_bootstrap_parses() { #[test] fn block_producer_start_parses() { - let _ = parse(&[ - "block-producer", - "start", - ]); + let _ = parse(&["block-producer", "start"]); } #[test] fn validator_bootstrap_parses() { - let _ = parse(&[ - "validator", - "bootstrap", - ]); + let _ = parse(&["validator", "bootstrap"]); } #[test] @@ -34,13 +28,10 @@ fn validator_start_parses() { #[test] fn bundled_bootstrap_parses() { - let _ = parse(&[ - "bundled", - "bootstrap", - ]); + let _ = parse(&["bundled", "bootstrap"]); } #[test] fn bundled_start_parses() { let _ = parse(&["bundled", "start"]); -} \ No newline at end of file +}