diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:37:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:37:20 +0800 |
| commit | bc5ae943843231b9bab0edcf5ab9d0a19bf37870 (patch) | |
| tree | ef0d88368725c57566dec9d7f0bac7d4e7e47060 /eth/protocol_test.go | |
| parent | baca0c2251a2587c136999a91449d9b6f7a6c60f (diff) | |
| parent | ca8d18417358906e32a33a7c03c51b6849c46dda (diff) | |
| download | dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.gz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.bz2 dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.lz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.xz dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.tar.zst dexon-bc5ae943843231b9bab0edcf5ab9d0a19bf37870.zip | |
Merge branch 'frontier/cli-private-network' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/cli-private-network
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 a2b59f117..108fb4475 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/errs" - "github.com/ethereum/go-ethereum/common" ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/discover" @@ -216,7 +216,7 @@ func (self *ethProtocolTester) checkMsg(i int, code uint64, val interface{}) (ms } func (self *ethProtocolTester) run() { - err := runEthProtocol(self.txPool, self.chainManager, self.blockPool, testPeer(), self.rw) + err := runEthProtocol(ProtocolVersion, NetworkId, self.txPool, self.chainManager, self.blockPool, testPeer(), self.rw) self.quit <- err } |