diff options
| author | obscuren <geffobscura@gmail.com> | 2014-02-15 06:56:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-02-15 06:56:09 +0800 |
| commit | f6d1bfe45bf3709d7bad40bf563b5c09228622e3 (patch) | |
| tree | df48311a5a494c66c74dcd51f1056cc699f01507 /peer.go | |
| parent | c2fb9f06ad018d01ce335c82b3542de16045a32d (diff) | |
| download | dexon-f6d1bfe45bf3709d7bad40bf563b5c09228622e3.tar.gz dexon-f6d1bfe45bf3709d7bad40bf563b5c09228622e3.tar.zst dexon-f6d1bfe45bf3709d7bad40bf563b5c09228622e3.zip | |
The great merge
Diffstat (limited to 'peer.go')
| -rw-r--r-- | peer.go | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -3,9 +3,9 @@ package eth import ( "bytes" "fmt" - "github.com/ethereum/ethchain-go" - "github.com/ethereum/ethutil-go" - "github.com/ethereum/ethwire-go" + "github.com/ethereum/eth-go/ethchain" + "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ethwire" "log" "net" "runtime" @@ -293,7 +293,7 @@ func (p *Peer) HandleInbound() { err = p.ethereum.BlockManager.ProcessBlock(block) if err != nil { - log.Println(err) + log.Println("bckmsg", err) break } else { lastBlock = block @@ -306,8 +306,7 @@ func (p *Peer) HandleInbound() { log.Println("Attempting to catch up") p.catchingUp = false p.CatchupWithPeer() - } - if ethchain.IsValidationErr(err) { + } else if ethchain.IsValidationErr(err) { // TODO } } else { |