From 325960d696de2e9e70832d9a260e4420eeadbb4e Mon Sep 17 00:00:00 2001 From: Daniil Polyakov Date: Mon, 16 Mar 2026 17:08:15 +0300 Subject: [PATCH] feat: remove `override_rust_log` from wallet config --- .../sequencer/sequencer_config.json | 2 -- integration_tests/src/config.rs | 1 - .../service/configs/debug/sequencer_config.json | 2 -- .../service/configs/docker/sequencer_config.json | 2 -- wallet/configs/debug/wallet_config.json | 1 - wallet/src/chain_storage.rs | 1 - wallet/src/cli/config.rs | 12 ------------ wallet/src/config.rs | 10 ---------- 8 files changed, 31 deletions(-) diff --git a/configs/docker-all-in-one/sequencer/sequencer_config.json b/configs/docker-all-in-one/sequencer/sequencer_config.json index c03cbf5e..d7fd3490 100644 --- a/configs/docker-all-in-one/sequencer/sequencer_config.json +++ b/configs/docker-all-in-one/sequencer/sequencer_config.json @@ -1,6 +1,5 @@ { "home": "/var/lib/sequencer_service", - "override_rust_log": null, "genesis_id": 1, "is_genesis_random": true, "max_num_tx_in_block": 20, @@ -8,7 +7,6 @@ "mempool_max_size": 10000, "block_create_timeout": "10s", "retry_pending_blocks_timeout": "7s", - "port": 3040, "bedrock_config": { "backoff": { "start_delay": "100ms", diff --git a/integration_tests/src/config.rs b/integration_tests/src/config.rs index dc24c8f0..22444458 100644 --- a/integration_tests/src/config.rs +++ b/integration_tests/src/config.rs @@ -234,7 +234,6 @@ pub fn wallet_config( initial_data: &InitialData, ) -> Result { Ok(WalletConfig { - override_rust_log: None, sequencer_addr: addr_to_url(UrlProtocol::Http, sequencer_addr) .context("Failed to convert sequencer addr to URL")?, seq_poll_timeout: Duration::from_secs(30), diff --git a/sequencer/service/configs/debug/sequencer_config.json b/sequencer/service/configs/debug/sequencer_config.json index 8491c2a1..4088fc4a 100644 --- a/sequencer/service/configs/debug/sequencer_config.json +++ b/sequencer/service/configs/debug/sequencer_config.json @@ -1,6 +1,5 @@ { "home": ".", - "override_rust_log": null, "genesis_id": 1, "is_genesis_random": true, "max_num_tx_in_block": 20, @@ -8,7 +7,6 @@ "mempool_max_size": 1000, "block_create_timeout": "15s", "retry_pending_blocks_timeout": "5s", - "port": 3040, "bedrock_config": { "backoff": { "start_delay": "100ms", diff --git a/sequencer/service/configs/docker/sequencer_config.json b/sequencer/service/configs/docker/sequencer_config.json index adefe1f4..f5a243d5 100644 --- a/sequencer/service/configs/docker/sequencer_config.json +++ b/sequencer/service/configs/docker/sequencer_config.json @@ -1,13 +1,11 @@ { "home": "/var/lib/sequencer_service", - "override_rust_log": null, "genesis_id": 1, "is_genesis_random": true, "max_num_tx_in_block": 20, "max_block_size": "1 MiB", "mempool_max_size": 10000, "block_create_timeout": "10s", - "port": 3040, "retry_pending_blocks_timeout": "7s", "bedrock_config": { "backoff": { diff --git a/wallet/configs/debug/wallet_config.json b/wallet/configs/debug/wallet_config.json index d279c0cb..759d67ee 100644 --- a/wallet/configs/debug/wallet_config.json +++ b/wallet/configs/debug/wallet_config.json @@ -1,5 +1,4 @@ { - "override_rust_log": null, "sequencer_addr": "http://127.0.0.1:3040", "seq_poll_timeout": "30s", "seq_tx_poll_max_blocks": 15, diff --git a/wallet/src/chain_storage.rs b/wallet/src/chain_storage.rs index 8a2cd09b..a88e0b8b 100644 --- a/wallet/src/chain_storage.rs +++ b/wallet/src/chain_storage.rs @@ -203,7 +203,6 @@ mod tests { fn create_sample_wallet_config() -> WalletConfig { WalletConfig { - override_rust_log: None, sequencer_addr: "http://127.0.0.1".parse().unwrap(), seq_poll_timeout: std::time::Duration::from_secs(12), seq_tx_poll_max_blocks: 5, diff --git a/wallet/src/cli/config.rs b/wallet/src/cli/config.rs index ac94a1b7..c9a5796f 100644 --- a/wallet/src/cli/config.rs +++ b/wallet/src/cli/config.rs @@ -37,15 +37,6 @@ impl WalletSubcommand for ConfigSubcommand { println!("{config_str}"); } else if let Some(key) = key { match key.as_str() { - "override_rust_log" => { - if let Some(value) = - &wallet_core.storage.wallet_config.override_rust_log - { - println!("{value}"); - } else { - println!("Not set"); - } - } "sequencer_addr" => { println!("{}", wallet_core.storage.wallet_config.sequencer_addr); } @@ -88,9 +79,6 @@ impl WalletSubcommand for ConfigSubcommand { } Self::Set { key, value } => { match key.as_str() { - "override_rust_log" => { - wallet_core.storage.wallet_config.override_rust_log = Some(value); - } "sequencer_addr" => { wallet_core.storage.wallet_config.sequencer_addr = value.parse()?; } diff --git a/wallet/src/config.rs b/wallet/src/config.rs index 7e8a526f..e74cd437 100644 --- a/wallet/src/config.rs +++ b/wallet/src/config.rs @@ -187,9 +187,6 @@ pub struct GasConfig { #[optfield::optfield(pub WalletConfigOverrides, rewrap, attrs = (derive(Debug, Default, Clone)))] #[derive(Debug, Clone, Serialize, Deserialize)] pub struct WalletConfig { - /// Override rust log (env var logging level). - #[serde(skip_serializing_if = "Option::is_none")] - pub override_rust_log: Option, /// Sequencer URL. pub sequencer_addr: Url, /// Sequencer polling duration for new blocks. @@ -211,7 +208,6 @@ pub struct WalletConfig { impl Default for WalletConfig { fn default() -> Self { Self { - override_rust_log: None, sequencer_addr: "http://127.0.0.1:3040".parse().unwrap(), seq_poll_timeout: Duration::from_secs(12), seq_tx_poll_max_blocks: 5, @@ -308,7 +304,6 @@ impl WalletConfig { pub fn apply_overrides(&mut self, overrides: WalletConfigOverrides) { let Self { - override_rust_log, sequencer_addr, seq_poll_timeout, seq_tx_poll_max_blocks, @@ -319,7 +314,6 @@ impl WalletConfig { } = self; let WalletConfigOverrides { - override_rust_log: o_override_rust_log, sequencer_addr: o_sequencer_addr, seq_poll_timeout: o_seq_poll_timeout, seq_tx_poll_max_blocks: o_seq_tx_poll_max_blocks, @@ -329,10 +323,6 @@ impl WalletConfig { basic_auth: o_basic_auth, } = overrides; - if let Some(v) = o_override_rust_log { - warn!("Overriding wallet config 'override_rust_log' to {v:#?}"); - *override_rust_log = v; - } if let Some(v) = o_sequencer_addr { warn!("Overriding wallet config 'sequencer_addr' to {v}"); *sequencer_addr = v;