tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed catching up

Browse Source
This commit is contained in:
obscuren 2014-05-14 20:50:37 +02:00
parent a6b9ea05e8
commit 65f570271c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
peer.go
View File

@ -321,8 +321,6 @@ func (p *Peer) HandleInbound() {
// We don't have this block, but we do have a block with the same prevHash, diversion time! // We don't have this block, but we do have a block with the same prevHash, diversion time!
if p.ethereum.StateManager().BlockChain().HasBlockWithPrevHash(block.PrevHash) { if p.ethereum.StateManager().BlockChain().HasBlockWithPrevHash(block.PrevHash) {
if p.ethereum.StateManager().BlockChain().FindCanonicalChainFromMsg(msg, block.PrevHash) { if p.ethereum.StateManager().BlockChain().FindCanonicalChainFromMsg(msg, block.PrevHash) {
p.catchingUp = false
return return
} }
} }
@ -373,12 +371,11 @@ func (p *Peer) HandleInbound() {
} }
} }
if lastBlock != nil && err == nil { if msg.Data.Len() == 0 {
fmt.Println("Did proc. no err") // Set catching up to false if
} else { // the peer has nothing left to give
fmt.Println("other") p.catchingUp = false
} }
fmt.Println("length of chain", msg.Data.Len())
case ethwire.MsgTxTy: case ethwire.MsgTxTy:
// If the message was a transaction queue the transaction // If the message was a transaction queue the transaction
// in the TxPool where it will undergo validation and // in the TxPool where it will undergo validation and