Change faulty logic

Author: Solar Mithril

crates/op-rbuilder/src/generator.rs

@@ -51,7 +51,8 @@ pub trait PayloadBuilder: Send + Sync + Clone {
         &self,
         args: BuildArguments<Self::Attributes, Self::BuiltPayload>,
         best_payload: BlockCell<Self::BuiltPayload>,
-    ) -> Result<(), PayloadBuilderError>;
+        tx: Sender<Result<(), PayloadBuilderError>>,
+    );
 }
 
 /// The generator type that creates new jobs that builds empty blocks.
@@ -174,6 +175,7 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
+use tokio::sync::oneshot::Sender;
 
 /// A [PayloadJob] that builds empty blocks.
 pub struct BlockPayloadJob<Builder>
@@ -256,8 +258,7 @@ where
             cancel,
         };
 
-        let result = builder.try_build(args, cell);
-        let _ = tx.send(result);
+        builder.try_build(args, cell, tx);
     }
 }
 
@@ -545,13 +546,15 @@ mod tests {
             &self,
             args: BuildArguments<Self::Attributes, Self::BuiltPayload>,
             _best_payload: BlockCell<Self::BuiltPayload>,
-        ) -> Result<(), PayloadBuilderError> {
+            tx: Sender<Result<(), PayloadBuilderError>>,
+        ) {
             self.new_event(BlockEvent::Started);
 
             loop {
                 if args.cancel.is_cancelled() {
                     self.new_event(BlockEvent::Cancelled);
-                    return Ok(());
+                    let _ = tx.send(Ok(()));
+                    return;
                 }
 
                 // Small sleep to prevent tight loop

crates/op-rbuilder/src/payload_builder_vanilla.rs

@@ -75,6 +75,7 @@ use revm::{
 use std::error::Error as StdError;
 use std::{fmt::Display, sync::Arc, time::Instant};
 use tokio::sync::oneshot;
+use tokio::sync::oneshot::Sender;
 use tokio_util::sync::CancellationToken;
 use tracing::{info, trace, warn};
 
@@ -274,10 +275,10 @@ where
         &self,
         args: BuildArguments<Self::Attributes, Self::BuiltPayload>,
         best_payload: BlockCell<Self::BuiltPayload>,
-    ) -> Result<(), PayloadBuilderError> {
+        tx: Sender<Result<(), PayloadBuilderError>>,
+    ) {
         let pool = self.pool.clone();
         let block_build_start_time = Instant::now();
-        let (tx, rx) = oneshot::channel();
         let ctx = self.clone();
         self.executor.spawn_blocking(Box::pin(async move {
             match ctx.build_payload(args, |attrs| {
@@ -313,7 +314,6 @@ where
                 }
             }
         }));
-        rx.blocking_recv().map_err(PayloadBuilderError::from)?
     }
 }