Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 4 commits into from
Oct 29, 2019
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d26162
[PAN-2830] improve message when extraData missing
kziemianek Oct 20, 2019
71e7d17
Merge branch 'master' into feature/PAN-2830-extradata-missing
kziemianek Oct 20, 2019
d6b71e5
[PAN-2830] improve test assertion
kziemianek Oct 28, 2019
14fa5de
Merge branch 'master' into feature/PAN-2830-extradata-missing
CjHare Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 8 additions & 0 deletions consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,14 @@ public void incorrectVoteTypeThrowsException() {
.isInstanceOf(RLPException.class);
}

@Test
public void emptyExtraDataThrowsException() {
final BytesValue bufferToInject = BytesValue.EMPTY;

assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
.isInstanceOf(IllegalArgumentException.class);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To ensure the exception returned is from the intended throw (although there is only one condition here, there could be many more IllegalArgumentException conditions in the future), it might also be worth asserting the message is that expected?

Suggested change
.isInstanceOf(IllegalArgumentException.class);
.isInstanceOf(IllegalArgumentException.class)
.hasMessage("Invalid BytesValue supplied - Ibft Extra Data required.");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I totally agree, PR updated.

}

private static byte[] createNonEmptyVanityData() {
final byte[] vanity_bytes = new byte[32];
for (int i = 0; i < vanity_bytes.length; i++) {
Expand Down