merge with upstream

beacon_node/execution_layer/src/engine_api/http.rs

@@ -977,8 +977,7 @@ mod test {
     use std::str::FromStr;
     use std::sync::Arc;
     use types::{
-        ExecutionPayloadMerge, ForkName, FullPayload, MainnetEthSpec, Transactions, Unsigned,
-        VariableList,
+        ExecutionPayloadMerge, ForkName, MainnetEthSpec, Transactions, Unsigned, VariableList,
     };
 
     struct Tester {

beacon_node/execution_layer/src/lib.rs

@@ -35,8 +35,6 @@ use tokio::{
     time::sleep,
 };
 use tokio_stream::wrappers::WatchStream;
-#[cfg(feature = "withdrawals")]
-use types::Withdrawal;
 use types::{AbstractExecPayload, Blob, ExecPayload, KzgCommitment};
 use types::{
     BlindedPayload, BlockType, ChainSpec, Epoch, ExecutionBlockHash, ForkName,

beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs

@@ -1,7 +1,7 @@
 use crate::{
     test_utils::{
-        Block, MockServer, DEFAULT_BUILDER_THRESHOLD_WEI, DEFAULT_JWT_SECRET,
-        DEFAULT_TERMINAL_BLOCK, DEFAULT_TERMINAL_DIFFICULTY,
+        MockServer, DEFAULT_BUILDER_THRESHOLD_WEI, DEFAULT_JWT_SECRET, DEFAULT_TERMINAL_BLOCK,
+        DEFAULT_TERMINAL_DIFFICULTY,
     },
     Config, *,
 };