Skip to content

Commit 7aadcad

Browse files
committed
Fix Problems Caused By Merge
1 parent 04b5f26 commit 7aadcad

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beacon_node/execution_layer/src/test_utils/execution_block_generator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ pub fn generate_blobs<E: EthSpec>(
699699
Ok((bundle, transactions.into()))
700700
}
701701

702-
fn static_valid_tx<T: EthSpec>() -> Result<Transaction<T::MaxBytesPerTransaction>, String> {
702+
pub fn static_valid_tx<T: EthSpec>() -> Result<Transaction<T::MaxBytesPerTransaction>, String> {
703703
// This is a real transaction hex encoded, but we don't care about the contents of the transaction.
704704
let transaction: EthersTransaction = serde_json::from_str(
705705
r#"{

beacon_node/execution_layer/src/test_utils/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use warp::{http::StatusCode, Filter, Rejection};
2525

2626
use crate::EngineCapabilities;
2727
pub use execution_block_generator::{
28-
generate_blobs, generate_genesis_block, generate_genesis_header, generate_pow_block, Block,
29-
ExecutionBlockGenerator,
28+
generate_blobs, generate_genesis_block, generate_genesis_header, generate_pow_block,
29+
static_valid_tx, Block, ExecutionBlockGenerator,
3030
};
3131
pub use hook::Hook;
3232
pub use mock_builder::{MockBuilder, Operation};

beacon_node/execution_layer/src/versioned_hashes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn beacon_tx_to_reth_signed_tx<N: Unsigned>(
6868
#[cfg(test)]
6969
mod test {
7070
use super::*;
71-
use crate::static_valid_tx;
71+
use crate::test_utils::static_valid_tx;
7272
use reth_primitives::Transaction;
7373

7474
type E = types::MainnetEthSpec;

0 commit comments

Comments
 (0)