code cleanup

Author: akundaz

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

@@ -456,19 +456,12 @@ where
                     // We got block cancelled, we won't need anything from the block at this point
                     // Caution: this assume that block cancel token only cancelled when new FCU is received
                     if block_cancel.is_cancelled() {
-                        ctx.metrics.block_built_success.increment(1);
-                        ctx.metrics
-                            .flashblock_count
-                            .record(ctx.flashblock_index() as f64);
-                        ctx.metrics.missing_flashblocks_count.record(
-                            flashblocks_per_block.saturating_sub(ctx.flashblock_index()) as f64,
+                        return self.exit_flashblock_building(
+                            &ctx,
+                            flashblocks_per_block,
+                            &span,
+                            "Payload building complete, job cancelled during execution",
                         );
-                        debug!(
-                            target: "payload_builder",
-                            message = "Payload building complete, job cancelled during execution"
-                        );
-                        span.record("flashblock_count", ctx.flashblock_index());
-                        return Ok(());
                     }
 
                     let payload_tx_simulation_time = tx_execution_start_time.elapsed();
@@ -517,20 +510,12 @@ where
                             // If main token got canceled in here that means we received get_payload and we should drop everything and now update best_payload
                             // To ensure that we will return same blocks as rollup-boost (to leverage caches)
                             if block_cancel.is_cancelled() {
-                                ctx.metrics.block_built_success.increment(1);
-                                ctx.metrics
-                                    .flashblock_count
-                                    .record(ctx.flashblock_index() as f64);
-                                ctx.metrics.missing_flashblocks_count.record(
-                                    flashblocks_per_block.saturating_sub(ctx.flashblock_index())
-                                        as f64,
-                                );
-                                debug!(
-                                    target: "payload_builder",
-                                    message = "Payload building complete, job cancelled during execution"
+                                return self.exit_flashblock_building(
+                                    &ctx,
+                                    flashblocks_per_block,
+                                    &span,
+                                    "Payload building complete, job cancelled during execution",
                                 );
-                                span.record("flashblock_count", ctx.flashblock_index());
-                                return Ok(());
                             }
                             self.ws_pub
                                 .publish(&fb_payload)
@@ -570,27 +555,44 @@ where
                     }
                 }
                 None => {
-                    // Exit loop if channel closed or cancelled
-                    ctx.metrics.block_built_success.increment(1);
-                    ctx.metrics
-                        .flashblock_count
-                        .record(ctx.flashblock_index() as f64);
-                    ctx.metrics
-                        .missing_flashblocks_count
-                        .record(flashblocks_per_block.saturating_sub(ctx.flashblock_index()) as f64);
-                    debug!(
-                        target: "payload_builder",
-                        message = "Payload building complete, channel closed or job cancelled",
-                        missing_falshblocks = flashblocks_per_block.saturating_sub(ctx.flashblock_index()),
-                        reduced_flashblocks = self.config.flashblocks_per_block().saturating_sub(flashblocks_per_block),
+                    return self.exit_flashblock_building(
+                        &ctx,
+                        flashblocks_per_block,
+                        &span,
+                        "Payload building complete, channel closed or job cancelled",
                     );
-                    span.record("flashblock_count", ctx.flashblock_index());
-                    return Ok(());
                 }
             }
         }
     }
 
+    /// Do some logging and metric recording when we stop build flashblocks
+    fn exit_flashblock_building(
+        &self,
+        ctx: &OpPayloadBuilderCtx<FlashblocksExtraCtx>,
+        flashblocks_per_block: u64,
+        span: &tracing::Span,
+        message: &str,
+    ) -> Result<(), PayloadBuilderError> {
+        ctx.metrics.block_built_success.increment(1);
+        ctx.metrics
+            .flashblock_count
+            .record(ctx.flashblock_index() as f64);
+        ctx.metrics
+            .missing_flashblocks_count
+            .record(flashblocks_per_block.saturating_sub(ctx.flashblock_index()) as f64);
+
+        debug!(
+            target: "payload_builder",
+            message = message,
+            missing_flashblocks = flashblocks_per_block.saturating_sub(ctx.flashblock_index()),
+            reduced_flashblocks = self.config.flashblocks_per_block().saturating_sub(flashblocks_per_block),
+        );
+
+        span.record("flashblock_count", ctx.flashblock_index());
+        Ok(())
+    }
+
     /// Spawn task that will send new flashblock level cancel token in steady intervals (first interval
     /// may vary if --flashblocks.dynamic enabled)
     pub fn spawn_timer_task(