diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:36:04 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-25 23:36:04 +0800 |
commit | 0efcd7ed05331c25b3f3d485c65354cfe99d8297 (patch) | |
tree | 9fb7530609c5e38666185521dab7349f6a6526f8 /eth/protocol_test.go | |
parent | 4019e2a6f2671cb812fab4754dfc5bf274a7b81b (diff) | |
parent | 036e6301af123ddc7d33f45545bdc083d1573bd8 (diff) | |
download | dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.gz dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.bz2 dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.lz dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.xz dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.tar.zst dexon-0efcd7ed05331c25b3f3d485c65354cfe99d8297.zip |
Merge pull request #1521 from obscuren/client-update
cmd/geth, core, eth: Version 1.0.0
Diffstat (limited to 'eth/protocol_test.go')
-rw-r--r-- | eth/protocol_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 7dcbc714c..4a6736b7a 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -60,7 +60,7 @@ func TestStatusMsgErrors(t *testing.T) { }, { code: StatusMsg, data: statusData{uint32(ProtocolVersions[0]), 999, td, currentBlock, genesis}, - wantError: errResp(ErrNetworkIdMismatch, "999 (!= 0)"), + wantError: errResp(ErrNetworkIdMismatch, "999 (!= 1)"), }, { code: StatusMsg, data: statusData{uint32(ProtocolVersions[0]), NetworkId, td, currentBlock, common.Hash{3}}, @@ -184,7 +184,7 @@ func newProtocolManagerForTesting(txAdded chan<- []*types.Transaction) *Protocol em = new(event.TypeMux) chain, _ = core.NewChainManager(db, db, db, core.FakePow{}, em) txpool = &fakeTxPool{added: txAdded} - pm = NewProtocolManager(0, em, txpool, core.FakePow{}, chain) + pm = NewProtocolManager(NetworkId, em, txpool, core.FakePow{}, chain) ) pm.Start() return pm |