Rework Ibft's MessageValidatorFactory

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManager.java

@@ -90,7 +90,7 @@ public IbftBlockHeightManager(
     this.roundChangeManager = roundChangeManager;
     this.finalState = finalState;
 
-    newRoundMessageValidator = messageValidatorFactory.createNewRoundValidator(parentHeader);
+    newRoundMessageValidator = messageValidatorFactory.createNewRoundValidator(getChainHeight());
 
     roundStateCreator =
         (roundIdentifier) ->
@@ -255,7 +255,7 @@ public void handleNewRoundPayload(final NewRound newRound) {
 
   @Override
   public long getChainHeight() {
-    return currentRound.getRoundIdentifier().getSequenceNumber();
+    return parentHeader.getNumber() + 1;
   }
 
   @Override

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java

@@ -49,7 +49,8 @@ private BlockHeightManager createFullBlockHeightManager(final BlockHeader parent
         finalState,
         new RoundChangeManager(
             IbftHelpers.calculateRequiredValidatorQuorum(finalState.getValidators().size()),
-            messageValidatorFactory.createRoundChangeMessageValidator(parentHeader)),
+            messageValidatorFactory.createRoundChangeMessageValidator(
+                parentHeader.getNumber() + 1L)),
         roundFactory,
         finalState.getClock(),
         messageValidatorFactory);

consensus/ibft/src/main/java/tech/pegasys/pantheon/consensus/ibft/validation/MessageValidatorFactory.java

@@ -21,7 +21,6 @@
 import tech.pegasys.pantheon.ethereum.BlockValidator;
 import tech.pegasys.pantheon.ethereum.ProtocolContext;
 import tech.pegasys.pantheon.ethereum.core.Address;
-import tech.pegasys.pantheon.ethereum.core.BlockHeader;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.Collection;
@@ -58,20 +57,20 @@ public MessageValidator createMessageValidator(final ConsensusRoundIdentifier ro
     return new MessageValidator(createSignedDataValidator(roundIdentifier));
   }
 
-  public RoundChangeMessageValidator createRoundChangeMessageValidator(
-      final BlockHeader parentHeader) {
+  public RoundChangeMessageValidator createRoundChangeMessageValidator(final long chainHeight) {
     final Collection<Address> validators =
         protocolContext.getConsensusState().getVoteTally().getValidators();
+
     return new RoundChangeMessageValidator(
         new RoundChangePayloadValidator(
             this::createSignedDataValidator,
             validators,
             prepareMessageCountForQuorum(
                 IbftHelpers.calculateRequiredValidatorQuorum(validators.size())),
-            parentHeader.getNumber() + 1));
+            chainHeight));
   }
 
-  public NewRoundMessageValidator createNewRoundValidator(final BlockHeader parentHeader) {
+  public NewRoundMessageValidator createNewRoundValidator(final long chainHeight) {
     final Collection<Address> validators =
         protocolContext.getConsensusState().getVoteTally().getValidators();
     return new NewRoundMessageValidator(
@@ -80,6 +79,6 @@ public NewRoundMessageValidator createNewRoundValidator(final BlockHeader parent
             proposerSelector,
             this::createSignedDataValidator,
             IbftHelpers.calculateRequiredValidatorQuorum(validators.size()),
-            parentHeader.getNumber() + 1));
+            chainHeight));
   }
 }

consensus/ibft/src/test/java/tech/pegasys/pantheon/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java

@@ -135,7 +135,7 @@ public void setup() {
     when(finalState.getMessageFactory()).thenReturn(messageFactory);
     when(blockCreator.createBlock(anyLong())).thenReturn(createdBlock);
     when(newRoundPayloadValidator.validateNewRoundMessage(any())).thenReturn(true);
-    when(messageValidatorFactory.createNewRoundValidator(any()))
+    when(messageValidatorFactory.createNewRoundValidator(anyLong()))
         .thenReturn(newRoundPayloadValidator);
     when(messageValidatorFactory.createMessageValidator(any())).thenReturn(messageValidator);