Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[EC-183] Added RLP enc/dec for PrePrepare, Commit and NewRound messages #200

Merged
merged 9 commits into from
Nov 22, 2018
Merged

[EC-183] Added RLP enc/dec for PrePrepare, Commit and NewRound messages #200

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e1f07c7
Added RLP enc/dec for PrePrepare, Commit and NewRound messages
saltiniroberto Oct 25, 2018
21bc754
Fixed bug in IbftUnsignedNewRoundMessageData::writeTo
saltiniroberto Nov 21, 2018
68200b6
Merge branch 'master' into add_ibft2_preprepare_commit_new_round_rlp_…
saltiniroberto Nov 21, 2018
2830c5f
Modified code as required by PR #264
saltiniroberto Nov 21, 2018
7d97c4c
Re-architectured to have common code for the fromMessage method
saltiniroberto Nov 22, 2018
07a0cc1
Added PrePrepare message to the NewRound message
saltiniroberto Nov 22, 2018
80dc146
Added getter for PrePrepare message included in a NewRound message
saltiniroberto Nov 22, 2018
cb7d1d2
Added getters to RoundChangeCertificate and PreparedCertificate
saltiniroberto Nov 22, 2018
a5607f2
Merge branch 'master' into add_ibft2_preprepare_commit_new_round_rlp_…
rain-on Nov 22, 2018
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
Prev Previous commit
Next Next commit
Fixed bug in IbftUnsignedNewRoundMessageData::writeTo
  • Loading branch information
@saltiniroberto
saltiniroberto committed Nov 21, 2018
commit 21bc75432cadf8b9386684620efa165eb543df31
10 changes: 4 additions & 6 deletions ...tech/pegasys/pantheon/consensus/ibft/ibftmessagedata/IbftUnsignedNewRoundMessageData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import tech.pegasys.pantheon.consensus.ibft.ConsensusRoundIdentifier;
import tech.pegasys.pantheon.consensus.ibft.ibftmessage.IbftV2;
import tech.pegasys.pantheon.ethereum.rlp.BytesValueRLPOutput;
import tech.pegasys.pantheon.ethereum.rlp.RLPInput;
import tech.pegasys.pantheon.ethereum.rlp.RLPOutput;

Expand Down Expand Up @@ -44,11 +43,10 @@ public IbftRoundChangeCertificate getRoundChangeCertificate() {
@Override
public void writeTo(final RLPOutput rlpOutput) {
// RLP encode of the message data content (round identifier and prepared certificate)
BytesValueRLPOutput ibftMessage = new BytesValueRLPOutput();
ibftMessage.startList();
roundChangeIdentifier.writeTo(ibftMessage);
roundChangeCertificate.writeTo(ibftMessage);
ibftMessage.endList();
rlpOutput.startList();
roundChangeIdentifier.writeTo(rlpOutput);
roundChangeCertificate.writeTo(rlpOutput);
rlpOutput.endList();
}

public static IbftUnsignedNewRoundMessageData readFrom(final RLPInput rlpInput) {
Expand Down