[PAN-2830] improve message when extraData missing (hyperledger#121)

Signed-off-by: Kasper Ziemianek <[email protected]> Signed-off-by: edwardmack <[email protected]>
ChainSafe · Nov 4, 2019 · dcb85e6 · dcb85e6
1 parent 14ce164
commit dcb85e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java
@@ -84,6 +84,10 @@ public static IbftExtraData decode(final BlockHeader blockHeader) {
   }
 
   static IbftExtraData decodeRaw(final BytesValue input) {
+    if (input.isEmpty()) {
+      throw new IllegalArgumentException("Invalid BytesValue supplied - Ibft Extra Data required.");
+    }
+
     final RLPInput rlpInput = new BytesValueRLPInput(input, false);
 
     rlpInput.enterList(); // This accounts for the "root node" which contains IBFT data items.

diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java
@@ -464,6 +464,15 @@ public void incorrectVoteTypeThrowsException() {
         .isInstanceOf(RLPException.class);
   }
 
+  @Test
+  public void emptyExtraDataThrowsException() {
+    final BytesValue bufferToInject = BytesValue.EMPTY;
+
+    assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid BytesValue supplied - Ibft Extra Data required.");
+  }
+
   private static byte[] createNonEmptyVanityData() {
     final byte[] vanity_bytes = new byte[32];
     for (int i = 0; i < vanity_bytes.length; i++) {