diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
| commit | e13c6739804604849c7e43d27b073e68fba58191 (patch) | |
| tree | b3471931b63210a4d107875dffd6572bcd96239e /eth/protocol_test.go | |
| parent | 965c9babe336cfa8d5c740d5356acbc5f9ba4a72 (diff) | |
| parent | 5f35e6778f10d9e2c6418beff7ed201be80448c4 (diff) | |
| download | dexon-e13c6739804604849c7e43d27b073e68fba58191.tar dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.gz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.bz2 dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.lz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.xz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.zst dexon-e13c6739804604849c7e43d27b073e68fba58191.zip | |
Merge remote-tracking branch 'ethereum/conversion' 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 } |