Remove QbftBlockHashing as this is provided by the block hash (#8311)

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

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

@@ -23,7 +23,6 @@
 import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
 import org.hyperledger.besu.consensus.common.EpochManager;
 import org.hyperledger.besu.consensus.common.ForksSchedule;
-import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
 import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
 import org.hyperledger.besu.consensus.common.bft.BftContext;
 import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
@@ -51,7 +50,6 @@
 import org.hyperledger.besu.consensus.qbft.adaptor.BlockUtil;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockCodecAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockCreatorFactoryAdaptor;
-import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockHashingAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockInterfaceAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockchainAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftExtraDataProviderAdaptor;
@@ -286,8 +284,7 @@ protected MiningCoordinator createMiningCoordinator(
             messageValidatorFactory,
             messageFactory,
             qbftExtraDataCodec,
-            new QbftExtraDataProviderAdaptor(qbftExtraDataCodec),
-            new QbftBlockHashingAdaptor(new BftBlockHashing(qbftExtraDataCodec)));
+            new QbftExtraDataProviderAdaptor(qbftExtraDataCodec));
     QbftBlockHeightManagerFactory qbftBlockHeightManagerFactory =
         new QbftBlockHeightManagerFactory(
             finalState,

consensus/qbft-core/src/integration-test/java/org/hyperledger/besu/consensus/qbft/core/support/IntegrationTestHelpers.java

@@ -14,22 +14,17 @@
  */
 package org.hyperledger.besu.consensus.qbft.core.support;
 
-import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
 import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
 import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
-import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockHashingAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockInterfaceAdaptor;
-import org.hyperledger.besu.consensus.qbft.adaptor.QbftExtraDataProviderAdaptor;
 import org.hyperledger.besu.consensus.qbft.core.payload.CommitPayload;
 import org.hyperledger.besu.consensus.qbft.core.payload.MessageFactory;
 import org.hyperledger.besu.consensus.qbft.core.statemachine.PreparedCertificate;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlock;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCodec;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockInterface;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftExtraDataProvider;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftHashMode;
 import org.hyperledger.besu.crypto.SECPSignature;
 import org.hyperledger.besu.cryptoservices.NodeKey;
@@ -42,18 +37,9 @@ public static SignedData<CommitPayload> createSignedCommitPayload(
       final NodeKey nodeKey,
       final QbftBlockCodec blockEncoder) {
 
-    final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec();
-
     final QbftBlock commitBlock =
         createCommitBlockFromProposalBlock(block, roundId.getRoundNumber());
-    final QbftBlockHashing blockHashing =
-        new QbftBlockHashingAdaptor(new BftBlockHashing(qbftExtraDataEncoder));
-    final QbftExtraDataProvider extraDataProvider =
-        new QbftExtraDataProviderAdaptor(qbftExtraDataEncoder);
-    final SECPSignature commitSeal =
-        nodeKey.sign(
-            blockHashing.calculateDataHashForCommittedSeal(
-                commitBlock.getHeader(), extraDataProvider.getExtraData(commitBlock.getHeader())));
+    final SECPSignature commitSeal = nodeKey.sign(commitBlock.getHash());
 
     final MessageFactory messageFactory = new MessageFactory(nodeKey, blockEncoder);
 

consensus/qbft-core/src/integration-test/java/org/hyperledger/besu/consensus/qbft/core/support/TestContextBuilder.java

@@ -32,7 +32,6 @@
 import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
 import org.hyperledger.besu.consensus.common.EpochManager;
 import org.hyperledger.besu.consensus.common.ForksSchedule;
-import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
 import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
 import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
 import org.hyperledger.besu.consensus.common.bft.BftContext;
@@ -65,7 +64,6 @@
 import org.hyperledger.besu.consensus.qbft.adaptor.BftEventHandlerAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockCodecAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockCreatorFactoryAdaptor;
-import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockHashingAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockInterfaceAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftBlockchainAdaptor;
 import org.hyperledger.besu.consensus.qbft.adaptor.QbftExtraDataProviderAdaptor;
@@ -80,7 +78,6 @@
 import org.hyperledger.besu.consensus.qbft.core.statemachine.QbftController;
 import org.hyperledger.besu.consensus.qbft.core.statemachine.QbftRoundFactory;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCodec;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockInterface;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftContext;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftEventHandler;
@@ -565,8 +562,6 @@ private static ControllerAndState createControllerAndFinalState(
             blockChain.getChainHeadBlockNumber());
     final QbftExtraDataProvider qbftExtraDataProvider =
         new QbftExtraDataProviderAdaptor(BFT_EXTRA_DATA_ENCODER);
-    final QbftBlockHashing blockHashing =
-        new QbftBlockHashingAdaptor(new BftBlockHashing(BFT_EXTRA_DATA_ENCODER));
     final QbftValidatorModeTransitionLoggerAdaptor validatorModeTransitionLogger =
         new QbftValidatorModeTransitionLoggerAdaptor(
             new ValidatorModeTransitionLogger(forksSchedule));
@@ -585,8 +580,7 @@ private static ControllerAndState createControllerAndFinalState(
                     messageValidatorFactory,
                     messageFactory,
                     BFT_EXTRA_DATA_ENCODER,
-                    qbftExtraDataProvider,
-                    blockHashing),
+                    qbftExtraDataProvider),
                 messageValidatorFactory,
                 messageFactory,
                 validatorModeTransitionLogger),

consensus/qbft-core/src/integration-test/java/org/hyperledger/besu/consensus/qbft/core/test/round/QbftRoundIntegrationTest.java

@@ -39,7 +39,6 @@
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlock;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCodec;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCreator;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHeader;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockImporter;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftContext;
@@ -103,7 +102,6 @@ public class QbftRoundIntegrationTest {
   @Mock private QbftBlockHeader parentHeader;
   @Mock private QbftBlockCodec blockEncoder;
   @Mock private QbftExtraDataProvider qbftExtraDataProvider;
-  @Mock private QbftBlockHashing blockHashing;
 
   private QbftBlock proposedBlock;
 
@@ -168,7 +166,6 @@ public void signingFailsOnReceiptOfProposalUpdatesRoundButTransmitsNothing() {
             roundTimer,
             bftExtraDataCodec,
             qbftExtraDataProvider,
-            blockHashing,
             parentHeader);
 
     round.handleProposalMessage(
@@ -209,7 +206,6 @@ public void failuresToSignStillAllowBlockToBeImported() {
             roundTimer,
             bftExtraDataCodec,
             qbftExtraDataProvider,
-            blockHashing,
             parentHeader);
 
     // inject a block first, then a prepare on it.

consensus/qbft-core/src/main/java/org/hyperledger/besu/consensus/qbft/core/statemachine/QbftRound.java

@@ -30,7 +30,6 @@
 import org.hyperledger.besu.consensus.qbft.core.payload.RoundChangePayload;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlock;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCreator;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHeader;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockImporter;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockInterface;
@@ -81,7 +80,6 @@ public class QbftRound {
   /** The Bft extra data provider */
   protected final QbftExtraDataProvider qbftExtraDataProvider;
 
-  private final QbftBlockHashing blockHashing;
   private final QbftBlockHeader parentHeader;
 
   /**
@@ -98,7 +96,6 @@ public class QbftRound {
    * @param roundTimer the round timer
    * @param bftExtraDataCodec the bft extra data codec
    * @param qbftExtraDataProvider the qbft extra data provider
-   * @param blockHashing the block hashing
    * @param parentHeader the parent header
    */
   public QbftRound(
@@ -113,7 +110,6 @@ public QbftRound(
       final RoundTimer roundTimer,
       final BftExtraDataCodec bftExtraDataCodec,
       final QbftExtraDataProvider qbftExtraDataProvider,
-      final QbftBlockHashing blockHashing,
       final QbftBlockHeader parentHeader) {
     this.roundState = roundState;
     this.blockCreator = blockCreator;
@@ -125,7 +121,6 @@ public QbftRound(
     this.transmitter = transmitter;
     this.bftExtraDataCodec = bftExtraDataCodec;
     this.qbftExtraDataProvider = qbftExtraDataProvider;
-    this.blockHashing = blockHashing;
     this.parentHeader = parentHeader;
     roundTimer.startTimer(getRoundIdentifier());
   }
@@ -395,10 +390,7 @@ private void importBlockToChain() {
 
   private SECPSignature createCommitSeal(final QbftBlock block) {
     final QbftBlock commitBlock = createCommitBlock(block);
-    final QbftBlockHeader proposedHeader = commitBlock.getHeader();
-    final BftExtraData extraData = qbftExtraDataProvider.getExtraData(proposedHeader);
-    final Hash commitHash =
-        blockHashing.calculateDataHashForCommittedSeal(proposedHeader, extraData);
+    final Hash commitHash = commitBlock.getHash();
     return nodeKey.sign(commitHash);
   }
 

consensus/qbft-core/src/main/java/org/hyperledger/besu/consensus/qbft/core/statemachine/QbftRoundFactory.java

@@ -20,7 +20,6 @@
 import org.hyperledger.besu.consensus.qbft.core.payload.MessageFactory;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCreator;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCreatorFactory;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHeader;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftExtraDataProvider;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftFinalState;
@@ -42,7 +41,6 @@ public class QbftRoundFactory {
   private final MessageFactory messageFactory;
   private final BftExtraDataCodec bftExtraDataCodec;
   private final QbftExtraDataProvider qbftExtraDataProvider;
-  private final QbftBlockHashing blockHashing;
 
   /**
    * Instantiates a new Qbft round factory.
@@ -55,7 +53,6 @@ public class QbftRoundFactory {
    * @param messageFactory the message factory
    * @param bftExtraDataCodec the bft extra data codec
    * @param qbftExtraDataProvider the bft extra data codec
-   * @param blockHashing the block hashing
    */
   public QbftRoundFactory(
       final QbftFinalState finalState,
@@ -65,8 +62,7 @@ public QbftRoundFactory(
       final MessageValidatorFactory messageValidatorFactory,
       final MessageFactory messageFactory,
       final BftExtraDataCodec bftExtraDataCodec,
-      final QbftExtraDataProvider qbftExtraDataProvider,
-      final QbftBlockHashing blockHashing) {
+      final QbftExtraDataProvider qbftExtraDataProvider) {
     this.finalState = finalState;
     this.blockCreatorFactory = finalState.getBlockCreatorFactory();
     this.protocolContext = protocolContext;
@@ -76,7 +72,6 @@ public QbftRoundFactory(
     this.messageFactory = messageFactory;
     this.bftExtraDataCodec = bftExtraDataCodec;
     this.qbftExtraDataProvider = qbftExtraDataProvider;
-    this.blockHashing = blockHashing;
   }
 
   /**
@@ -128,7 +123,6 @@ public QbftRound createNewRoundWithState(
         finalState.getRoundTimer(),
         bftExtraDataCodec,
         qbftExtraDataProvider,
-        blockHashing,
         parentHeader);
   }
 }

consensus/qbft-core/src/test/java/org/hyperledger/besu/consensus/qbft/core/statemachine/QbftBlockHeightManagerTest.java

@@ -48,7 +48,6 @@
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlock;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCodec;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockCreator;
-import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHashing;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockHeader;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockImporter;
 import org.hyperledger.besu.consensus.qbft.core.types.QbftBlockInterface;
@@ -120,7 +119,6 @@ public class QbftBlockHeightManagerTest {
   @Mock private QbftValidatorProvider validatorProvider;
   @Mock private QbftProtocolSpec protocolSpec;
   @Mock private QbftBlockImporter blockImporter;
-  @Mock private QbftBlockHashing blockHashing;
 
   @Captor private ArgumentCaptor<MessageData> sentMessageArgCaptor;
 
@@ -178,7 +176,6 @@ public void setup() {
                   roundTimer,
                   bftExtraDataCodec,
                   qbftExtraDataProvider,
-                  blockHashing,
                   parentHeader);
             });
 
@@ -198,7 +195,6 @@ public void setup() {
                   roundTimer,
                   bftExtraDataCodec,
                   qbftExtraDataProvider,
-                  blockHashing,
                   parentHeader);
             });
 
@@ -410,7 +406,6 @@ public void messagesForFutureRoundsAreBufferedAndUsedToPreloadNewRoundWhenItIsSt
     when(finalState.getQuorum()).thenReturn(1);
     when(blockInterface.replaceRoundInBlock(eq(createdBlock), eq(2), any()))
         .thenReturn(createdBlock);
-    when(blockHashing.calculateDataHashForCommittedSeal(any(), any())).thenReturn(Hash.ZERO);
     when(blockCreator.createSealedBlock(any(), any(), anyInt(), any())).thenReturn(createdBlock);
     when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);
@@ -461,7 +456,6 @@ public void messagesForCurrentRoundAreBufferedAndUsedToPreloadRoundWhenItIsStart
     when(blockTimer.checkEmptyBlockExpired(any(), eq(0L))).thenReturn(true);
     when(blockInterface.replaceRoundInBlock(eq(createdBlock), eq(0), any()))
         .thenReturn(createdBlock);
-    when(blockHashing.calculateDataHashForCommittedSeal(any(), any())).thenReturn(Hash.ZERO);
     when(blockCreator.createSealedBlock(any(), any(), anyInt(), any())).thenReturn(createdBlock);
     when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);