refactor: extract flashblock timing code and test it

crates/op-rbuilder/src/args/op.rs

@@ -128,27 +128,6 @@ pub struct FlashblocksArgs {
     )]
     pub flashblocks_block_time: u64,
 
-    /// Builder would always thry to produce fixed number of flashblocks without regard to time of
-    /// FCU arrival.
-    /// In cases of late FCU it could lead to partially filled blocks.
-    #[arg(
-        long = "flashblocks.fixed",
-        default_value = "false",
-        env = "FLASHBLOCK_FIXED"
-    )]
-    pub flashblocks_fixed: bool,
-
-    /// Time by which blocks would be completed earlier in milliseconds.
-    ///
-    /// This time used to account for latencies, this time would be deducted from total block
-    /// building time before calculating number of fbs.
-    #[arg(
-        long = "flashblocks.leeway-time",
-        default_value = "0",
-        env = "FLASHBLOCK_LEEWAY_TIME"
-    )]
-    pub flashblocks_leeway_time: u64,
-
     /// Whether to disable state root calculation for each flashblock
     #[arg(
         long = "flashblocks.disable-state-root",
@@ -176,14 +155,6 @@ pub struct FlashblocksArgs {
     )]
     pub flashblocks_number_contract_use_permit: bool,
 
-    /// Build flashblock at the end of the flashblock interval
-    #[arg(
-        long = "flashblocks.build-at-interval-end",
-        env = "FLASHBLOCK_BUILD_AT_INTERVAL_END",
-        default_value = "false"
-    )]
-    pub flashblocks_build_at_interval_end: bool,
-
     /// Offset in milliseconds for when to send flashblocks.
     /// Positive values send late, negative values send early.
     /// Example: -20 sends 20ms early, 20 sends 20ms late.

crates/op-rbuilder/src/builders/flashblocks/config.rs

@@ -18,19 +18,6 @@ pub struct FlashblocksConfig {
     /// per block is equal to the block time divided by the flashblock interval.
     pub interval: Duration,
 
-    /// How much time would be deducted from block build time to account for latencies in
-    /// milliseconds.
-    ///
-    /// If dynamic_adjustment is false this value would be deducted from first flashblock and
-    /// it shouldn't be more than interval
-    ///
-    /// If dynamic_adjustment is true this value would be deducted from first flashblock and
-    /// it shouldn't be more than interval
-    pub leeway_time: Duration,
-
-    /// Disables dynamic flashblocks number adjustment based on FCU arrival time
-    pub fixed: bool,
-
     /// Should we disable state root calculation for each flashblock
     pub disable_state_root: bool,
 
@@ -42,9 +29,6 @@ pub struct FlashblocksConfig {
     /// whether to use permit signatures for the contract calls
     pub number_contract_use_permit: bool,
 
-    /// Build flashblock at the end of the flashblock interval
-    pub build_at_interval_end: bool,
-
     /// Offset in milliseconds for when to send flashblocks.
     /// Positive values send late, negative values send early.
     pub send_offset_ms: i64,
@@ -77,12 +61,9 @@ impl Default for FlashblocksConfig {
         Self {
             ws_addr: SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), 1111),
             interval: Duration::from_millis(250),
-            leeway_time: Duration::from_millis(0),
-            fixed: false,
             disable_state_root: false,
             number_contract_address: None,
             number_contract_use_permit: false,
-            build_at_interval_end: false,
             send_offset_ms: 0,
             end_buffer_ms: 0,
             p2p_enabled: false,
@@ -106,10 +87,6 @@ impl TryFrom<OpRbuilderArgs> for FlashblocksConfig {
             args.flashblocks.flashblocks_port,
         );
 
-        let leeway_time = Duration::from_millis(args.flashblocks.flashblocks_leeway_time);
-
-        let fixed = args.flashblocks.flashblocks_fixed;
-
         let disable_state_root = args.flashblocks.flashblocks_disable_state_root;
 
         let number_contract_address = args.flashblocks.flashblocks_number_contract_address;
@@ -119,12 +96,9 @@ impl TryFrom<OpRbuilderArgs> for FlashblocksConfig {
         Ok(Self {
             ws_addr,
             interval,
-            leeway_time,
-            fixed,
             disable_state_root,
             number_contract_address,
             number_contract_use_permit,
-            build_at_interval_end: args.flashblocks.flashblocks_build_at_interval_end,
             send_offset_ms: args.flashblocks.flashblocks_send_offset_ms,
             end_buffer_ms: args.flashblocks.flashblocks_end_buffer_ms,
             p2p_enabled: args.flashblocks.p2p.p2p_enabled,

crates/op-rbuilder/src/builders/flashblocks/mod.rs

@@ -11,6 +11,7 @@ mod p2p;
 mod payload;
 mod payload_handler;
 mod service;
+mod timing;
 mod wspub;
 
 /// Block building strategy that progressively builds chunks of a block and makes them available