diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:39:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:39:56 +0800 |
| commit | c12046d6bfb197adb0004d629a783dd92f0cfc0f (patch) | |
| tree | 2904bb92564979b234e134e2d06638e82e912828 /eth/protocol_test.go | |
| parent | baca0c2251a2587c136999a91449d9b6f7a6c60f (diff) | |
| parent | 79f90bf7c1c089ecc57fc5baecda636a0be5c5bb (diff) | |
| download | go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.gz go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.bz2 go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.lz go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.xz go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.tar.zst go-tangerine-c12046d6bfb197adb0004d629a783dd92f0cfc0f.zip | |
Merge branch 'ethersphere-frontier/cli-private-network' into develop
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 } |