fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

fixes from review

Browse Source
This commit is contained in:
Ethan Buchman 2018-04-27 10:29:05 -04:00
parent f67c5a9e7b
commit c45ba2967a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/node.go
View File

@ -402,7 +402,7 @@ func (n *Node) OnStart() error {
// Add ourselves to addrbook to prevent dialing ourselves // Add ourselves to addrbook to prevent dialing ourselves
n.addrBook.AddOurAddress(nodeInfo.NetAddress()) n.addrBook.AddOurAddress(nodeInfo.NetAddress())
// Run the RPC server first // Start the RPC server before the P2P server
// so we can eg. receive txs for the first block // so we can eg. receive txs for the first block
if n.config.RPC.ListenAddress != "" { if n.config.RPC.ListenAddress != "" {
listeners, err := n.startRPC() listeners, err := n.startRPC()
@ -412,7 +412,7 @@ func (n *Node) OnStart() error {
n.rpcListeners = listeners n.rpcListeners = listeners
} }
// Start the switch // Start the switch (the P2P server).
err = n.sw.Start() err = n.sw.Start()
if err != nil { if err != nil {
return err return err

4
types/part_set.go
View File

@ -267,7 +267,7 @@ func (ps *PartSet) StringShort() string {
func (ps *PartSet) MarshalJSON() ([]byte, error) { func (ps *PartSet) MarshalJSON() ([]byte, error) {
if ps == nil { if ps == nil {
return []byte("nil-PartSet"), nil return []byte("{}"), nil
} }
ps.mtx.Lock() ps.mtx.Lock()
@ -278,6 +278,6 @@ func (ps *PartSet) MarshalJSON() ([]byte, error) {
PartsBitArray *cmn.BitArray `json:"parts_bit_array"` PartsBitArray *cmn.BitArray `json:"parts_bit_array"`
}{ }{
fmt.Sprintf("%d/%d", ps.Count(), ps.Total()), fmt.Sprintf("%d/%d", ps.Count(), ps.Total()),
ps.partsBitArray.Copy(), ps.partsBitArray,
}) })
} }

8
types/vote_set.go
View File

@ -56,9 +56,9 @@ type VoteSet struct {
height int64 height int64
round int round int
type_ byte type_ byte
valSet *ValidatorSet
mtx sync.Mutex mtx sync.Mutex
valSet *ValidatorSet
votesBitArray *cmn.BitArray votesBitArray *cmn.BitArray
votes []*Vote // Primary votes to share votes []*Vote // Primary votes to share
sum int64 // Sum of voting power for seen votes, discounting conflicts sum int64 // Sum of voting power for seen votes, discounting conflicts
@ -399,6 +399,8 @@ func (voteSet *VoteSet) HasTwoThirdsAny() bool {
} }
func (voteSet *VoteSet) HasAll() bool { func (voteSet *VoteSet) HasAll() bool {
voteSet.mtx.Lock()
defer voteSet.mtx.Unlock()
return voteSet.sum == voteSet.valSet.TotalVotingPower() return voteSet.sum == voteSet.valSet.TotalVotingPower()
} }
@ -424,6 +426,8 @@ func (voteSet *VoteSet) String() string {
} }
func (voteSet *VoteSet) StringIndented(indent string) string { func (voteSet *VoteSet) StringIndented(indent string) string {
voteSet.mtx.Lock()
defer voteSet.mtx.Unlock()
voteStrings := make([]string, len(voteSet.votes)) voteStrings := make([]string, len(voteSet.votes))
for i, vote := range voteSet.votes { for i, vote := range voteSet.votes {
if vote == nil { if vote == nil {
@ -448,6 +452,8 @@ func (voteSet *VoteSet) StringIndented(indent string) string {
// Marshal the VoteSet to JSON. Same as String(), just in JSON, // Marshal the VoteSet to JSON. Same as String(), just in JSON,
// and without the height/round/type_ (since its already included in the votes). // and without the height/round/type_ (since its already included in the votes).
func (voteSet *VoteSet) MarshalJSON() ([]byte, error) { func (voteSet *VoteSet) MarshalJSON() ([]byte, error) {
voteSet.mtx.Lock()
defer voteSet.mtx.Unlock()
voteStrings := make([]string, len(voteSet.votes)) voteStrings := make([]string, len(voteSet.votes))
for i, vote := range voteSet.votes { for i, vote := range voteSet.votes {
if vote == nil { if vote == nil {