Fix Problems Caused By Merge

Author: ethDreamer

Cargo.lock

@@ -699,7 +699,7 @@ pub fn generate_blobs<E: EthSpec>(
     Ok((bundle, transactions.into()))
 }
 
-fn static_valid_tx<T: EthSpec>() -> Result<Transaction<T::MaxBytesPerTransaction>, String> {
+pub fn static_valid_tx<T: EthSpec>() -> Result<Transaction<T::MaxBytesPerTransaction>, String> {
     // This is a real transaction hex encoded, but we don't care about the contents of the transaction.
     let transaction: EthersTransaction = serde_json::from_str(
         r#"{

beacon_node/execution_layer/src/test_utils/execution_block_generator.rs

@@ -25,8 +25,8 @@ use warp::{http::StatusCode, Filter, Rejection};
 
 use crate::EngineCapabilities;
 pub use execution_block_generator::{
-    generate_blobs, generate_genesis_block, generate_genesis_header, generate_pow_block, Block,
-    ExecutionBlockGenerator,
+    generate_blobs, generate_genesis_block, generate_genesis_header, generate_pow_block,
+    static_valid_tx, Block, ExecutionBlockGenerator,
 };
 pub use hook::Hook;
 pub use mock_builder::{MockBuilder, Operation};

beacon_node/execution_layer/src/test_utils/mod.rs

@@ -68,7 +68,7 @@ pub fn beacon_tx_to_reth_signed_tx<N: Unsigned>(
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::static_valid_tx;
+    use crate::test_utils::static_valid_tx;
     use reth_primitives::Transaction;
 
     type E = types::MainnetEthSpec;