diff --git a/consensus/simplebft/backlog.go b/consensus/simplebft/backlog.go index 80fb0b4aeda..c1db0af83c6 100644 --- a/consensus/simplebft/backlog.go +++ b/consensus/simplebft/backlog.go @@ -24,10 +24,10 @@ func (s *SBFT) testBacklog(m *Msg, src uint64) bool { return true } - return s.testBacklog2(m, src) + return s.testBacklogMessage(m, src) } -func (s *SBFT) testBacklog2(m *Msg, src uint64) bool { +func (s *SBFT) testBacklogMessage(m *Msg, src uint64) bool { record := func(seq *SeqView) bool { if !s.activeView { return true @@ -80,7 +80,7 @@ func (s *SBFT) processBacklog() { for len(state.backLog) > 0 { m, rest := state.backLog[0], state.backLog[1:] - if s.testBacklog2(m, src) { + if s.testBacklogMessage(m, src) { notReady++ break } diff --git a/consensus/simplebft/simplebft.go b/consensus/simplebft/simplebft.go index f9272cd025a..761d9293151 100644 --- a/consensus/simplebft/simplebft.go +++ b/consensus/simplebft/simplebft.go @@ -192,12 +192,6 @@ func (s *SBFT) Receive(m *Msg, src uint64) { } else if req := m.GetRequest(); req != nil { s.handleRequest(req, src) return - } else if vs := m.GetViewChange(); vs != nil { - s.handleViewChange(vs, src) - return - } else if nv := m.GetNewView(); nv != nil { - s.handleNewView(nv, src) - return } if s.testBacklog(m, src) { @@ -222,6 +216,12 @@ func (s *SBFT) handleQueueableMessage(m *Msg, src uint64) { } else if c := m.GetCheckpoint(); c != nil { s.handleCheckpoint(c, src) return + } else if vs := m.GetViewChange(); vs != nil { + s.handleViewChange(vs, src) + return + } else if nv := m.GetNewView(); nv != nil { + s.handleNewView(nv, src) + return } log.Warningf("received invalid message from %d", src)