Revert "chore(op-payload-builder): Refactor optimism_payload into smaller, reusable functions" (#11041)

crates/optimism/node/src/lib.rs

@@ -23,8 +23,7 @@ pub use node::OptimismNode;
 pub mod txpool;
 
 pub use reth_optimism_payload_builder::{
-    OptimismBlockAttributes, OptimismBuiltPayload, OptimismPayloadBuilder,
-    OptimismPayloadBuilderAttributes,
+    OptimismBuiltPayload, OptimismPayloadBuilder, OptimismPayloadBuilderAttributes,
 };
 
 pub use reth_evm_optimism::*;

crates/optimism/payload/src/lib.rs

@@ -12,10 +12,9 @@
 #![cfg(feature = "optimism")]
 
 pub mod builder;
-pub use builder::{OptimismBlockAttributes, OptimismPayloadBuilder};
+pub use builder::OptimismPayloadBuilder;
 pub mod error;
 pub mod payload;
-
 pub use payload::{
     OptimismBuiltPayload, OptimismPayloadAttributes, OptimismPayloadBuilderAttributes,
 };

crates/payload/builder/src/error.rs

@@ -15,9 +15,6 @@ pub enum PayloadBuilderError {
     /// An oneshot channels has been closed.
     #[error("sender has been dropped")]
     ChannelClosed,
-    /// Build cancelled
-    #[error("build outcome cancelled")]
-    BuildOutcomeCancelled,
     /// If there's no payload to resolve.
     #[error("missing payload")]
     MissingPayload,