diff options
| author | John Lee <64482439+algojohnlee@users.noreply.github.com> | 2021-04-16 16:52:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 16:52:50 -0400 |
| commit | fbd32c8aa273d51df7e73d865e1a80c9f3025d26 (patch) | |
| tree | eb341e9bf9c41a94bc76b76da5083e7b06097b3c | |
| parent | 7f7082dfeb6a43d4363db7ce2f046814be3d1281 (diff) | |
| parent | 82a781dd0c991ddfed116e94907acacbb266f8f4 (diff) | |
Merge pull request #2081 from onetechnical/onetechnical/relbeta2.5.5v2.5.5-beta
go-algorand 2.5.5-beta
| -rw-r--r-- | agreement/player.go | 28 | ||||
| -rw-r--r-- | buildnumber.dat | 2 |
2 files changed, 11 insertions, 19 deletions
diff --git a/agreement/player.go b/agreement/player.go index 445eaff78..85c0c1805 100644 --- a/agreement/player.go +++ b/agreement/player.go @@ -555,29 +555,21 @@ func (p *player) handleMessageEvent(r routerHandle, e messageEvent) (actions []a case payloadPipelined: ep := ef.(payloadProcessedEvent) if ep.Round == p.Round { - up := e.Input.UnauthenticatedProposal - uv := ef.(payloadProcessedEvent).Vote.u() - - a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv}) - actions = append(actions, a) return append(actions, verifyPayloadAction(e, ep.Round, ep.Period, ep.Pinned)) } } - // relay as the proposer - if e.Input.MessageHandle == nil { - var uv unauthenticatedVote - switch ef.t() { - case payloadPipelined, payloadAccepted: - uv = ef.(payloadProcessedEvent).Vote.u() - case proposalCommittable: - uv = ef.(committableEvent).Vote.u() - } - up := e.Input.UnauthenticatedProposal - - a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv}) - actions = append(actions, a) + var uv unauthenticatedVote + switch ef.t() { + case payloadPipelined, payloadAccepted: + uv = ef.(payloadProcessedEvent).Vote.u() + case proposalCommittable: + uv = ef.(committableEvent).Vote.u() } + up := e.Input.UnauthenticatedProposal + + a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv}) + actions = append(actions, a) // If the payload is valid, check it against any received cert threshold. // Of course, this should only trigger for payloadVerified case. diff --git a/buildnumber.dat b/buildnumber.dat index b8626c4cf..7ed6ff82d 100644 --- a/buildnumber.dat +++ b/buildnumber.dat @@ -1 +1 @@ -4 +5 |