diff options
| author | Wei-Ning Huang <w@dexon.org> | 2019-03-17 10:43:10 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:23 +0800 |
| commit | 5f64e1d10d620a8a299ff3a40695f26107f157c5 (patch) | |
| tree | e28e2bf073ac7da8417e5b0789d2d0713e240ae7 /dex/handler.go | |
| parent | 9493109f2be4507605e6b17e406bf8fd147ab3c8 (diff) | |
| download | go-tangerine-5f64e1d10d620a8a299ff3a40695f26107f157c5.tar.gz go-tangerine-5f64e1d10d620a8a299ff3a40695f26107f157c5.tar.zst go-tangerine-5f64e1d10d620a8a299ff3a40695f26107f157c5.zip | |
core: fill in genesis timstamp and remove dMoment from protocol handshake (#263)
Fill in dmoment as genesis block timestamp. This allow us to remove
dMoment check from protocol handshake since genesis block hash itself
will protect us against different dMoment.
Diffstat (limited to 'dex/handler.go')
| -rw-r--r-- | dex/handler.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dex/handler.go b/dex/handler.go index 76219c747..ea04e6fbc 100644 --- a/dex/handler.go +++ b/dex/handler.go @@ -97,7 +97,6 @@ func errResp(code errCode, format string, v ...interface{}) error { type ProtocolManager struct { networkID uint64 - dMoment uint64 fastSync uint32 // Flag whether fast sync is enabled (gets disabled if we already have blocks) acceptTxs uint32 // Flag whether we're considered synchronised (enables transaction processing) @@ -158,14 +157,13 @@ type ProtocolManager struct { // with the Ethereum network. func NewProtocolManager( config *params.ChainConfig, mode downloader.SyncMode, networkID uint64, - dMoment uint64, mux *event.TypeMux, txpool txPool, engine consensus.Engine, + mux *event.TypeMux, txpool txPool, engine consensus.Engine, blockchain *core.BlockChain, chaindb ethdb.Database, isBlockProposer bool, gov governance, app dexconApp) (*ProtocolManager, error) { tab := newNodeTable() // Create the protocol manager with the base fields manager := &ProtocolManager{ networkID: networkID, - dMoment: dMoment, eventMux: mux, txpool: txpool, nodeTable: tab, @@ -355,7 +353,7 @@ func (pm *ProtocolManager) handle(p *peer) error { hash = head.Hash() number = head.Number.Uint64() ) - if err := p.Handshake(pm.networkID, pm.dMoment, number, hash, genesis.Hash()); err != nil { + if err := p.Handshake(pm.networkID, number, hash, genesis.Hash()); err != nil { p.Log().Debug("Ethereum handshake failed", "err", err) return err } |