Revert "Revert "renames, remove , wrap BlockWrapper enum to make descontruction private""

This reverts commit 1931a442dc.
2026-03-15 19:02:42 +00:00 · 2022-12-28 10:31:18 -05:00
parent 1931a442dc
commit 8a70d80a2f
19 changed files with 231 additions and 268 deletions
--- a/beacon_node/network/src/beacon_processor/mod.rs
+++ b/beacon_node/network/src/beacon_processor/mod.rs
@@ -1699,7 +1699,7 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                        message_id,
                        peer_id,
                        peer_client,
-                        BlockWrapper::Block(block),
+                        block.into(),
                        work_reprocessing_tx,
                        duplicate_cache,
                        seen_timestamp,
@@ -1721,7 +1721,7 @@ impl<T: BeaconChainTypes> BeaconProcessor<T> {
                        message_id,
                        peer_id,
                        peer_client,
-                        BlockWrapper::BlockAndBlob(block_sidecar_pair),
+                        block_sidecar_pair.into(),
                        work_reprocessing_tx,
                        duplicate_cache,
                        seen_timestamp,