Revert "Sync block body (#8242)" (#8887)

This reverts commit 2fb25ce.

Signed-off-by: [email protected] <[email protected]>

Author: pinges

app/src/main/java/org/hyperledger/besu/RunnerBuilder.java

@@ -721,7 +721,7 @@ public Runner build() {
         .getBlockchain()
         .observeBlockAdded(
             blockAddedEvent -> {
-              if (protocolSchedule.isOnMilestoneBoundary(blockAddedEvent.getHeader())) {
+              if (protocolSchedule.isOnMilestoneBoundary(blockAddedEvent.getBlock().getHeader())) {
                 network.updateNodeRecord();
               }
             });

app/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java

@@ -114,7 +114,7 @@ protected MiningCoordinator createMiningCoordinator(
             o ->
                 miningConfiguration.setBlockPeriodSeconds(
                     forksSchedule
-                        .getFork(o.getHeader().getNumber() + 1)
+                        .getFork(o.getBlock().getHeader().getNumber() + 1)
                         .getValue()
                         .getBlockPeriodSeconds()));
 

app/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java

@@ -247,7 +247,7 @@ protected MiningCoordinator createMiningCoordinator(
             o ->
                 miningConfiguration.setBlockPeriodSeconds(
                     forksSchedule
-                        .getFork(o.getHeader().getNumber() + 1)
+                        .getFork(o.getBlock().getHeader().getNumber() + 1)
                         .getValue()
                         .getBlockPeriodSeconds()));
 

app/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java

@@ -224,7 +224,7 @@ protected MergeContext createConsensusContext(
     blockchain.observeBlockAdded(
         blockAddedEvent ->
             blockchain
-                .getTotalDifficultyByHash(blockAddedEvent.getHeader().getHash())
+                .getTotalDifficultyByHash(blockAddedEvent.getBlock().getHeader().getHash())
                 .ifPresent(mergeContext::setIsPostMerge));
 
     return mergeContext;

app/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java

@@ -332,12 +332,12 @@ protected MiningCoordinator createMiningCoordinator(
             o -> {
               miningConfiguration.setBlockPeriodSeconds(
                   qbftForksSchedule
-                      .getFork(o.getHeader().getNumber() + 1)
+                      .getFork(o.getBlock().getHeader().getNumber() + 1)
                       .getValue()
                       .getBlockPeriodSeconds());
               miningConfiguration.setEmptyBlockPeriodSeconds(
                   qbftForksSchedule
-                      .getFork(o.getHeader().getNumber() + 1)
+                      .getFork(o.getBlock().getHeader().getNumber() + 1)
                       .getValue()
                       .getEmptyBlockPeriodSeconds());
             });

app/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java

@@ -88,8 +88,8 @@ public long addBlockAddedListener(final BlockAddedListener listener) {
         event ->
             listener.onBlockAdded(
                 blockAddedContext(
-                    event::getHeader,
-                    () -> event.getBlock().getBody(),
+                    event.getBlock()::getHeader,
+                    event.getBlock()::getBody,
                     event::getTransactionReceipts)));
   }
 

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java

@@ -132,7 +132,7 @@ public void changeTargetGasLimit(final Long targetGasLimit) {
 
   @Override
   public void onBlockAdded(final BlockAddedEvent event) {
-    final long currentBlock = event.getHeader().getNumber();
+    final long currentBlock = event.getBlock().getHeader().getNumber();
     final MiningCoordinator nextMiningCoordinator =
         miningCoordinatorSchedule.getFork(currentBlock + 1).getValue();
 

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java

@@ -258,7 +258,7 @@ public void changeTargetGasLimit(final Long targetGasLimit) {
   public void onBlockAdded(final BlockAddedEvent event) {
     if (event.isNewCanonicalHead()) {
       LOG.trace("New canonical head detected");
-      eventQueue.add(new NewChainHead(event.getHeader()));
+      eventQueue.add(new NewChainHead(event.getBlock().getHeader()));
     }
   }
 

consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java

@@ -904,8 +904,7 @@ public void onBlockAdded(final BlockAddedEvent event) {
         prevParent, genesisState.getBlock().getHash(), genesisState.getBlock().getHash());
     assertThat(lastBlockAddedEvent.get().getCommonAncestorHash()).isEqualTo(expectedCommonAncestor);
     assertThat(lastBlockAddedEvent.get().getEventType()).isEqualTo(EventType.CHAIN_REORG);
-    assertThat(lastBlockAddedEvent.get().getHeader().getHash())
-        .isEqualTo(prevParent.getBlockHash());
+    assertThat(lastBlockAddedEvent.get().getBlock().getHash()).isEqualTo(prevParent.getBlockHash());
   }
 
   @Test

consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java

@@ -108,7 +108,7 @@ public void setUp() {
     blockchain.observeBlockAdded(
         blockAddedEvent ->
             blockchain
-                .getTotalDifficultyByHash(blockAddedEvent.getHeader().getHash())
+                .getTotalDifficultyByHash(blockAddedEvent.getBlock().getHeader().getHash())
                 .ifPresent(mergeContext::setIsPostMerge));
   }