From 110589d3320fb57b2c55db022ce04b9c0140ec60 Mon Sep 17 00:00:00 2001 From: Daniil Polyakov Date: Thu, 20 Nov 2025 15:34:44 +0300 Subject: [PATCH] refactor: remove RpcRollingConfig --- common/src/rpc_primitives/mod.rs | 19 ------------------- sequencer_rpc/src/lib.rs | 10 +--------- sequencer_rpc/src/net_utils.rs | 2 -- sequencer_rpc/src/process.rs | 6 +----- 4 files changed, 2 insertions(+), 35 deletions(-) diff --git a/common/src/rpc_primitives/mod.rs b/common/src/rpc_primitives/mod.rs index ffa8564..ee64fb4 100644 --- a/common/src/rpc_primitives/mod.rs +++ b/common/src/rpc_primitives/mod.rs @@ -1,5 +1,3 @@ -use std::time::Duration; - use serde::{Deserialize, Serialize}; pub mod errors; @@ -7,21 +5,6 @@ pub mod message; pub mod parser; pub mod requests; -#[derive(Serialize, Deserialize, Clone, Copy, Debug)] -pub struct RpcPollingConfig { - pub polling_interval: Duration, - pub polling_timeout: Duration, -} - -impl Default for RpcPollingConfig { - fn default() -> Self { - Self { - polling_interval: Duration::from_millis(500), - polling_timeout: Duration::from_secs(10), - } - } -} - #[derive(Serialize, Deserialize, Clone, Debug)] pub struct RpcLimitsConfig { /// Maximum byte size of the json payload. @@ -40,7 +23,6 @@ impl Default for RpcLimitsConfig { pub struct RpcConfig { pub addr: String, pub cors_allowed_origins: Vec, - pub polling_config: RpcPollingConfig, #[serde(default)] pub limits_config: RpcLimitsConfig, } @@ -50,7 +32,6 @@ impl Default for RpcConfig { RpcConfig { addr: "0.0.0.0:3040".to_owned(), cors_allowed_origins: vec!["*".to_owned()], - polling_config: RpcPollingConfig::default(), limits_config: RpcLimitsConfig::default(), } } diff --git a/sequencer_rpc/src/lib.rs b/sequencer_rpc/src/lib.rs index 02d62f2..40d5b16 100644 --- a/sequencer_rpc/src/lib.rs +++ b/sequencer_rpc/src/lib.rs @@ -5,10 +5,7 @@ pub mod types; use std::sync::Arc; use common::{ - rpc_primitives::{ - RpcPollingConfig, - errors::{RpcError, RpcErrorKind}, - }, + rpc_primitives::errors::{RpcError, RpcErrorKind}, transaction::EncodedTransaction, }; use mempool::MemPoolHandle; @@ -23,11 +20,6 @@ use self::types::err_rpc::RpcErr; //ToDo: Add necessary fields pub struct JsonHandler { - #[expect( - dead_code, - reason = "Decided to keep it just in case, should we remove it?" - )] - polling_config: RpcPollingConfig, sequencer_state: Arc>, mempool_handle: MemPoolHandle, } diff --git a/sequencer_rpc/src/net_utils.rs b/sequencer_rpc/src/net_utils.rs index 9e41fc6..6ec4b70 100644 --- a/sequencer_rpc/src/net_utils.rs +++ b/sequencer_rpc/src/net_utils.rs @@ -53,12 +53,10 @@ pub fn new_http_server( let RpcConfig { addr, cors_allowed_origins, - polling_config, limits_config, } = config; info!(target:NETWORK, "Starting http server at {addr}"); let handler = web::Data::new(JsonHandler { - polling_config, sequencer_state: seuquencer_core.clone(), mempool_handle, }); diff --git a/sequencer_rpc/src/process.rs b/sequencer_rpc/src/process.rs index 7f7146a..fed3a67 100644 --- a/sequencer_rpc/src/process.rs +++ b/sequencer_rpc/src/process.rs @@ -321,10 +321,7 @@ mod tests { use crate::{JsonHandler, rpc_handler}; use base58::ToBase58; use base64::{Engine, engine::general_purpose}; - use common::{ - rpc_primitives::RpcPollingConfig, test_utils::sequencer_sign_key_for_testing, - transaction::EncodedTransaction, - }; + use common::{test_utils::sequencer_sign_key_for_testing, transaction::EncodedTransaction}; use sequencer_core::{ SequencerCore, @@ -405,7 +402,6 @@ mod tests { ( JsonHandler { - polling_config: RpcPollingConfig::default(), sequencer_state: sequencer_core, mempool_handle, },