merge upstream

2026-03-10 20:22:02 +00:00 · 2022-12-07 12:27:21 -05:00
parent 33721d17b2 b6486e809d
commit 6c8b1b323b
37 changed files with 225 additions and 1454 deletions
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -916,8 +916,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 {