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

Jump to bottom

fix: general improvements in tm2/bft/consensus #1495

Closed
wants to merge 13 commits into from
Closed

fix: general improvements in tm2/bft/consensus #1495

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc1fdb0
try
petar-dambovaliev Jan 3, 2024
37bd55a
save
petar-dambovaliev Jan 4, 2024
643e5a3
Merge branch 'master' into 1320
petar-dambovaliev Jan 4, 2024
854b8cf
save
petar-dambovaliev Jan 12, 2024
1beea62
save
petar-dambovaliev Jan 15, 2024
d902247
save
petar-dambovaliev Jan 15, 2024
8e3ab26
save
petar-dambovaliev Feb 22, 2024
c536ea2
Merge branch 'master' into 1320
petar-dambovaliev Feb 22, 2024
69fe220
save
petar-dambovaliev Feb 22, 2024
2b50ee6
save
petar-dambovaliev Feb 22, 2024
eefe2de
Merge branch 'master' into 1320
petar-dambovaliev Mar 26, 2024
f0cefcf
save
petar-dambovaliev Mar 26, 2024
92abef4
save
petar-dambovaliev Mar 26, 2024
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
8 changes: 4 additions & 4 deletions tm2/pkg/bft/consensus/reactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ func (conR *ConsensusReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte)
ps.ApplyHasVoteMessage(msg)
case *VoteSetMaj23Message:
cs := conR.conS
cs.mtx.Lock()
cs.mtx.RLock()
petar-dambovaliev marked this conversation as resolved.
Show resolved Hide resolved
height, votes := cs.Height, cs.Votes
cs.mtx.Unlock()
cs.mtx.RUnlock()
if height != msg.Height {
return
}
Expand Down Expand Up @@ -324,9 +324,9 @@ func (conR *ConsensusReactor) Receive(chID byte, src p2p.Peer, msgBytes []byte)
switch msg := msg.(type) {
case *VoteSetBitsMessage:
cs := conR.conS
cs.mtx.Lock()
cs.mtx.RLock()
height, votes := cs.Height, cs.Votes
cs.mtx.Unlock()
cs.mtx.RUnlock()

if height == msg.Height {
var ourVotes *bitarray.BitArray
Expand Down
Loading