diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index 57fee7183..5ecd5efe3 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -280,7 +280,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: '1.17' + go-version: '1.20' - uses: actions/setup-dotnet@v3 with: dotnet-version: '6.0.201' diff --git a/Cargo.lock b/Cargo.lock index 37c6fe667..5d5d32157 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2463,6 +2463,7 @@ dependencies = [ "fork_choice", "futures", "hex", + "logging", "reqwest", "sensitive_url", "serde_json", diff --git a/testing/execution_engine_integration/Cargo.toml b/testing/execution_engine_integration/Cargo.toml index 26b5f596f..de3085d22 100644 --- a/testing/execution_engine_integration/Cargo.toml +++ b/testing/execution_engine_integration/Cargo.toml @@ -21,3 +21,4 @@ deposit_contract = { path = "../../common/deposit_contract" } reqwest = { version = "0.11.0", features = ["json"] } hex = "0.4.2" fork_choice = { path = "../../consensus/fork_choice" } +logging = { path = "../../common/logging" } diff --git a/testing/execution_engine_integration/src/test_rig.rs b/testing/execution_engine_integration/src/test_rig.rs index 5455b48bc..ee20129f8 100644 --- a/testing/execution_engine_integration/src/test_rig.rs +++ b/testing/execution_engine_integration/src/test_rig.rs @@ -100,7 +100,7 @@ async fn import_and_unlock(http_url: SensitiveUrl, priv_keys: &[&str], password: impl TestRig { pub fn new(generic_engine: E) -> Self { - let log = environment::null_logger().unwrap(); + let log = logging::test_logger(); let runtime = Arc::new( tokio::runtime::Builder::new_multi_thread() .enable_all() @@ -281,7 +281,9 @@ impl TestRig { PayloadAttributes { timestamp, prev_randao, - suggested_fee_recipient: Address::zero(), + // To save sending proposer preparation data, just set the fee recipient + // to the fee recipient configured for EE A. + suggested_fee_recipient: Address::repeat_byte(42), }, ) .await; @@ -330,6 +332,7 @@ impl TestRig { .await .unwrap() .execution_payload; + assert_eq!(valid_payload.transactions.len(), pending_txs.len()); /* * Execution Engine A: @@ -394,7 +397,6 @@ impl TestRig { .await .unwrap(); assert_eq!(status, PayloadStatus::Valid); - assert_eq!(valid_payload.transactions.len(), pending_txs.len()); // Verify that all submitted txs were successful for pending_tx in pending_txs { @@ -479,7 +481,9 @@ impl TestRig { let payload_attributes = PayloadAttributes { timestamp: second_payload.timestamp + 1, prev_randao: Hash256::zero(), - suggested_fee_recipient: Address::zero(), + // To save sending proposer preparation data, just set the fee recipient + // to the fee recipient configured for EE A. + suggested_fee_recipient: Address::repeat_byte(42), }; let slot = Slot::new(42); let head_block_root = Hash256::repeat_byte(100);