diff options
| author | Wei-Ning Huang <w@dexon.org> | 2019-03-17 10:43:10 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:58 +0800 |
| commit | 64f26af59d24881bcdd49bbdd291c1a21a12b82d (patch) | |
| tree | 4968dc2006c6cabd118fc200b85bd05dc180efd0 /dex/helper_test.go | |
| parent | 2818ad97f5b302f76e3296195bf8daae1868c435 (diff) | |
| download | dexon-64f26af59d24881bcdd49bbdd291c1a21a12b82d.tar.gz dexon-64f26af59d24881bcdd49bbdd291c1a21a12b82d.tar.zst dexon-64f26af59d24881bcdd49bbdd291c1a21a12b82d.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/helper_test.go')
| -rw-r--r-- | dex/helper_test.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/dex/helper_test.go b/dex/helper_test.go index c8bf62a6b..4f5541052 100644 --- a/dex/helper_test.go +++ b/dex/helper_test.go @@ -46,8 +46,6 @@ var ( testBank = crypto.PubkeyToAddress(testBankKey.PublicKey) ) -const dMoment = 123456 - // testP2PServer is a fake, helper p2p server for testing purposes. type testP2PServer struct { mu sync.Mutex @@ -135,7 +133,7 @@ func newTestProtocolManager(mode downloader.SyncMode, blocks int, generator func notarySetFunc: func(uint64) (map[string]struct{}, error) { return nil, nil }, } - pm, err := NewProtocolManager(gspec.Config, mode, DefaultConfig.NetworkId, dMoment, evmux, &testTxPool{added: newtx}, engine, blockchain, db, true, tgov, &testApp{}) + pm, err := NewProtocolManager(gspec.Config, mode, DefaultConfig.NetworkId, evmux, &testTxPool{added: newtx}, engine, blockchain, db, true, tgov, &testApp{}) if err != nil { return nil, nil, err } @@ -275,18 +273,17 @@ func newTestPeer(name string, version int, pm *ProtocolManager, shake bool) (*te head = pm.blockchain.CurrentHeader() number = head.Number.Uint64() ) - tp.handshake(nil, dMoment, number, head.Hash(), genesis.Hash()) + tp.handshake(nil, number, head.Hash(), genesis.Hash()) } return tp, errc } // handshake simulates a trivial handshake that expects the same state from the // remote side as we are simulating locally. -func (p *testPeer) handshake(t *testing.T, dMoment uint64, number uint64, head common.Hash, genesis common.Hash) { +func (p *testPeer) handshake(t *testing.T, number uint64, head common.Hash, genesis common.Hash) { msg := &statusData{ ProtocolVersion: uint32(p.version), NetworkId: DefaultConfig.NetworkId, - DMoment: uint64(dMoment), Number: number, CurrentBlock: head, GenesisBlock: genesis, |