aboutsummaryrefslogtreecommitdiffstats
path: root/eth/handler.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-01-31 18:46:38 +0800
committerGitHub <noreply@github.com>2018-01-31 18:46:38 +0800
commitfdb34b7a7c87142cde48a2ec092f77a56d66f773 (patch)
tree6608a33f95d5067d23f01c6951eca3f983c3566d /eth/handler.go
parent07d4a022573444eac0db2f5da500cc5ee1e940bb (diff)
parent566d5c0777c2c5ee1a8fe3c0aee1e5c8c69053e2 (diff)
downloaddexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar.gz
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar.bz2
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar.lz
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar.xz
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.tar.zst
dexon-fdb34b7a7c87142cde48a2ec092f77a56d66f773.zip
Merge pull request #15996 from karalabe/drop-redundant-methods
core, eth, les, light: get rid of redundant methods
Diffstat (limited to 'eth/handler.go')
-rw-r--r--eth/handler.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/eth/handler.go b/eth/handler.go
index 074cffd96..fcd53c5a6 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -257,8 +257,14 @@ func (pm *ProtocolManager) handle(p *peer) error {
p.Log().Debug("Ethereum peer connected", "name", p.Name())
// Execute the Ethereum handshake
- td, head, genesis := pm.blockchain.Status()
- if err := p.Handshake(pm.networkId, td, head, genesis); err != nil {
+ var (
+ genesis = pm.blockchain.Genesis()
+ head = pm.blockchain.CurrentHeader()
+ hash = head.Hash()
+ number = head.Number.Uint64()
+ td = pm.blockchain.GetTd(hash, number)
+ )
+ if err := p.Handshake(pm.networkId, td, hash, genesis.Hash()); err != nil {
p.Log().Debug("Ethereum handshake failed", "err", err)
return err
}