merge with upstream

2026-03-09 11:41:51 +00:00 · 2022-12-07 13:11:21 -05:00
parent e5f26516bd 6c8b1b323b
commit dbc57ba2d9
36 changed files with 224 additions and 1453 deletions
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/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 {