Additional test checks

PegaSysEng · Nov 29, 2018 · a0dc32b · a0dc32b
1 parent 271b6fd
commit a0dc32b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...ain/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidator.java b/...ain/java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidator.java
@@ -125,7 +125,8 @@ private boolean validatePreprepareCertificateRound(
     }
 
     if (prepareCertRound.getRoundNumber() >= roundChangeTarget.getRoundNumber()) {
-      LOG.info("Invalid RoundChange message, PreprepareCertificate is not for a past round.");
+      LOG.info(
+          "Invalid RoundChange message, PreprepareCertificate is newer than RoundChange target.");
       return false;
     }
     return true;

diff --git a/...java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidatorTest.java b/...java/tech/pegasys/pantheon/consensus/ibft/validation/RoundChangeMessageValidatorTest.java
@@ -70,6 +70,11 @@ public void setup() {
 
     when(block.getHash()).thenReturn(Hash.fromHexStringLenient("1"));
     when(validatorFactory.createAt(any())).thenReturn(basicValidator);
+
+    // By default, have all basic messages being valid thus any failures are attributed to logic
+    // in the RoundChangeMessageValidator
+    when(basicValidator.addPreprepareMessage(any())).thenReturn(true);
+    when(basicValidator.validatePrepareMessage(any())).thenReturn(true);
   }
 
   @Test
@@ -183,6 +188,9 @@ public void roundChangeWithPreprepareFromARoundAheadOfRoundChangeTargetFails() {
             targetRound, Optional.of(prepareCertificate));
 
     assertThat(validator.validateMessage(msg)).isFalse();
+    verify(validatorFactory, never()).createAt(any());
+    verify(basicValidator, never()).validatePrepareMessage(prepareMsg);
+    verify(basicValidator, never()).validateCommmitMessage(any());
   }
 
   @Test