diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
| commit | 8305d409d2ca83583d9fa7e837ec0a46ce6ba78e (patch) | |
| tree | 956c768957f56044113772a88a9cbe7de0ef9cf1 /eth/protocol.go | |
| parent | b64ad7a2a6544564b68f362f18c70476310396d6 (diff) | |
| parent | 5c251b69282b3992512d0c17ed0063f294a0e663 (diff) | |
| download | go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.gz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.bz2 go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.lz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.xz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.zst go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'eth/protocol.go')
| -rw-r--r-- | eth/protocol.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eth/protocol.go b/eth/protocol.go index d7a7fa910..fb694c877 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -92,13 +92,14 @@ func EthProtocol(txPool txPool, chainManager chainManager, blockPool blockPool) // the main loop that handles incoming messages // note RemovePeer in the post-disconnect hook func runEthProtocol(txPool txPool, chainManager chainManager, blockPool blockPool, peer *p2p.Peer, rw p2p.MsgReadWriter) (err error) { + id := peer.ID() self := ðProtocol{ txPool: txPool, chainManager: chainManager, blockPool: blockPool, rw: rw, peer: peer, - id: fmt.Sprintf("%x", peer.Identity().Pubkey()[:8]), + id: fmt.Sprintf("%x", id[:8]), } err = self.handleStatus() if err == nil { |