diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
| commit | f0bb13609939ebbee22e9c9f39c6742341b0d20b (patch) | |
| tree | f92e9d256edd93cb384a2c1f9bddc0084347ee38 /eth/protocol_test.go | |
| parent | f9a6038f5b82cad6956c9cbb7f1220d97570632b (diff) | |
| parent | c12046d6bfb197adb0004d629a783dd92f0cfc0f (diff) | |
| download | dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.gz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.bz2 dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.lz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.xz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.zst dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.zip | |
Merge branch 'develop' into conversion
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 } |