diff options
author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-09-13 17:30:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-13 17:30:42 +0800 |
commit | ce3e7931016bb5f3a68e1b27e308bb54522b34a4 (patch) | |
tree | 56ff2ec31a1c8dfcdad80772815de75438f29a79 /core/consensus.go | |
parent | 41f4c2fd789d6b58ca076e675b2ce931aaedb37b (diff) | |
download | dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar.gz dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar.bz2 dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar.lz dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar.xz dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.tar.zst dexon-consensus-ce3e7931016bb5f3a68e1b27e308bb54522b34a4.zip |
core: Fix BA Fork issues (#104)
Diffstat (limited to 'core/consensus.go')
-rw-r--r-- | core/consensus.go | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/consensus.go b/core/consensus.go index ef39795..85b6e38 100644 --- a/core/consensus.go +++ b/core/consensus.go @@ -72,12 +72,12 @@ type consensusReceiver struct { func (recv *consensusReceiver) ProposeVote(vote *types.Vote) { if err := recv.consensus.prepareVote(recv.chainID, vote); err != nil { - fmt.Println(err) + log.Println(err) return } go func() { if err := recv.consensus.ProcessVote(vote); err != nil { - fmt.Println(err) + log.Println(err) return } recv.consensus.network.BroadcastVote(vote) @@ -87,12 +87,12 @@ func (recv *consensusReceiver) ProposeVote(vote *types.Vote) { func (recv *consensusReceiver) ProposeBlock(hash common.Hash) { block, exist := recv.consensus.baModules[recv.chainID].findCandidateBlock(hash) if !exist { - fmt.Println(ErrUnknownBlockProposed) - fmt.Println(hash) + log.Println(ErrUnknownBlockProposed) + log.Println(hash) return } if err := recv.consensus.PreProcessBlock(block); err != nil { - fmt.Println(err) + log.Println(err) return } recv.consensus.network.BroadcastBlock(block) @@ -101,11 +101,11 @@ func (recv *consensusReceiver) ProposeBlock(hash common.Hash) { func (recv *consensusReceiver) ConfirmBlock(hash common.Hash) { block, exist := recv.consensus.baModules[recv.chainID].findCandidateBlock(hash) if !exist { - fmt.Println(ErrUnknownBlockConfirmed, hash) + log.Println(ErrUnknownBlockConfirmed, hash) return } if err := recv.consensus.ProcessBlock(block); err != nil { - fmt.Println(err) + log.Println(err) return } recv.restart <- struct{}{} @@ -294,10 +294,10 @@ func (con *Consensus) RunLegacy() { }, } if err := con.PrepareGenesisBlock(genesisBlock, time.Now().UTC()); err != nil { - fmt.Println(err) + log.Println(err) } if err := con.ProcessBlock(genesisBlock); err != nil { - fmt.Println(err) + log.Println(err) } con.network.BroadcastBlock(genesisBlock) @@ -315,10 +315,10 @@ ProposingBlockLoop: }, } if err := con.PrepareBlock(block, time.Now().UTC()); err != nil { - fmt.Println(err) + log.Println(err) } if err := con.ProcessBlock(block); err != nil { - fmt.Println(err) + log.Println(err) } con.network.BroadcastBlock(block) } @@ -344,15 +344,15 @@ func (con *Consensus) processMsg( switch val := msg.(type) { case *types.Block: if err := blockProcesser(val); err != nil { - fmt.Println(err) + log.Println(err) } case *types.NotaryAck: if err := con.ProcessNotaryAck(val); err != nil { - fmt.Println(err) + log.Println(err) } case *types.Vote: if err := con.ProcessVote(val); err != nil { - fmt.Println(err) + log.Println(err) } } } @@ -367,11 +367,11 @@ func (con *Consensus) proposeBlock(chainID uint32) *types.Block { }, } if err := con.PrepareBlock(block, time.Now().UTC()); err != nil { - fmt.Println(err) + log.Println(err) return nil } if err := con.baModules[chainID].prepareBlock(block, con.prvKey); err != nil { - fmt.Println(err) + log.Println(err) return nil } return block |