From 49c8c96896802feffe2e27784e9468b2fd420a5a Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Thu, 6 Jun 2024 18:06:51 +0200
Subject: [PATCH] chore: change build_empty_payload to require &self (#8646)

---
 crates/optimism/payload/src/builder.rs           | 1 +
 crates/payload/basic/src/lib.rs                  | 6 ++++--
 crates/payload/ethereum/src/lib.rs               | 1 +
 examples/custom-engine-types/src/main.rs         | 6 +++---
 examples/custom-payload-builder/src/generator.rs | 2 +-
 examples/custom-payload-builder/src/job.rs       | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/crates/optimism/payload/src/builder.rs b/crates/optimism/payload/src/builder.rs
index ff72160d4..9e94b6e3b 100644
--- a/crates/optimism/payload/src/builder.rs
+++ b/crates/optimism/payload/src/builder.rs
@@ -103,6 +103,7 @@ where
     }
 
     fn build_empty_payload(
+        &self,
         client: &Client,
         config: PayloadConfig<Self::Attributes>,
     ) -> Result<OptimismBuiltPayload, PayloadBuilderError> {
diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs
index 7f3646d2a..1c066c56b 100644
--- a/crates/payload/basic/src/lib.rs
+++ b/crates/payload/basic/src/lib.rs
@@ -460,7 +460,7 @@ where
         // away and the first full block should have been built by the time CL is requesting the
         // payload.
         self.metrics.inc_requested_empty_payload();
-        Builder::build_empty_payload(&self.client, self.config.clone())
+        self.builder.build_empty_payload(&self.client, self.config.clone())
     }
 
     fn payload_attributes(&self) -> Result<Self::PayloadAttributes, PayloadBuilderError> {
@@ -501,8 +501,9 @@ where
             let (tx, rx) = oneshot::channel();
             let client = self.client.clone();
             let config = self.config.clone();
+            let builder = self.builder.clone();
             self.executor.spawn_blocking(Box::pin(async move {
-                let res = Builder::build_empty_payload(&client, config);
+                let res = builder.build_empty_payload(&client, config);
                 let _ = tx.send(res);
             }));
 
@@ -784,6 +785,7 @@ pub trait PayloadBuilder<Pool, Client>: Send + Sync + Clone {
 
     /// Builds an empty payload without any transaction.
     fn build_empty_payload(
+        &self,
         client: &Client,
         config: PayloadConfig<Self::Attributes>,
     ) -> Result<Self::BuiltPayload, PayloadBuilderError>;
diff --git a/crates/payload/ethereum/src/lib.rs b/crates/payload/ethereum/src/lib.rs
index 599138fdb..6f701576e 100644
--- a/crates/payload/ethereum/src/lib.rs
+++ b/crates/payload/ethereum/src/lib.rs
@@ -77,6 +77,7 @@ where
     }
 
     fn build_empty_payload(
+        &self,
         client: &Client,
         config: PayloadConfig<Self::Attributes>,
     ) -> Result<EthBuiltPayload, PayloadBuilderError> {
diff --git a/examples/custom-engine-types/src/main.rs b/examples/custom-engine-types/src/main.rs
index 7156440db..ca7c00404 100644
--- a/examples/custom-engine-types/src/main.rs
+++ b/examples/custom-engine-types/src/main.rs
@@ -302,6 +302,7 @@ where
     }
 
     fn build_empty_payload(
+        &self,
         client: &Client,
         config: PayloadConfig<Self::Attributes>,
     ) -> Result<Self::BuiltPayload, PayloadBuilderError> {
@@ -313,9 +314,8 @@ where
             attributes,
             chain_spec,
         } = config;
-        <reth_ethereum_payload_builder::EthereumPayloadBuilder  as PayloadBuilder<Pool,Client>>  ::build_empty_payload(client,
-                                                                                                                       PayloadConfig { initialized_block_env, initialized_cfg, parent_block, extra_data, attributes: attributes.0, chain_spec }
-        )
+        <reth_ethereum_payload_builder::EthereumPayloadBuilder as PayloadBuilder<Pool, Client>>::build_empty_payload(&reth_ethereum_payload_builder::EthereumPayloadBuilder::default(),client,
+                                                                                                                     PayloadConfig { initialized_block_env, initialized_cfg, parent_block, extra_data, attributes: attributes.0, chain_spec })
     }
 }
 
diff --git a/examples/custom-payload-builder/src/generator.rs b/examples/custom-payload-builder/src/generator.rs
index fe29c33bb..288b20de4 100644
--- a/examples/custom-payload-builder/src/generator.rs
+++ b/examples/custom-payload-builder/src/generator.rs
@@ -89,7 +89,7 @@ where
             client: self.client.clone(),
             _pool: self.pool.clone(),
             _executor: self.executor.clone(),
-            _builder: self.builder.clone(),
+            builder: self.builder.clone(),
             config,
         })
     }
diff --git a/examples/custom-payload-builder/src/job.rs b/examples/custom-payload-builder/src/job.rs
index 6438c6b08..154e5165e 100644
--- a/examples/custom-payload-builder/src/job.rs
+++ b/examples/custom-payload-builder/src/job.rs
@@ -26,7 +26,7 @@ where
     /// The type responsible for building payloads.
     ///
     /// See [PayloadBuilder]
-    pub(crate) _builder: Builder,
+    pub(crate) builder: Builder,
 }
 
 impl<Client, Pool, Tasks, Builder> PayloadJob for EmptyBlockPayloadJob<Client, Pool, Tasks, Builder>
@@ -44,7 +44,7 @@ where
     type BuiltPayload = Builder::BuiltPayload;
 
     fn best_payload(&self) -> Result<Self::BuiltPayload, PayloadBuilderError> {
-        let payload = Builder::build_empty_payload(&self.client, self.config.clone())?;
+        let payload = self.builder.build_empty_payload(&self.client, self.config.clone())?;
         Ok(payload)
     }