diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-22 19:41:31 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-25 19:55:56 +0800 |
| commit | 036e6301af123ddc7d33f45545bdc083d1573bd8 (patch) | |
| tree | 9ed4f3eec686167ef50e7df0e06223f9b08ad22c /eth/protocol_test.go | |
| parent | 5001f778aac5cf77a200da7829f8d28547208fed (diff) | |
| download | dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar.gz dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar.bz2 dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar.lz dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar.xz dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.tar.zst dexon-036e6301af123ddc7d33f45545bdc083d1573bd8.zip | |
cmd/geth, core, eth: Version 1.0.0
Genesis release. Closes #1402
Conflicts:
cmd/geth/main.go
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 |