diff options
author | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
commit | c8438979a9c5c73bf68a132d5fd0325863ab454b (patch) | |
tree | 1792da4ffa92e3a225bd37079c0458ea4b101d23 /chain/helper_test.go | |
parent | 141d3caabbfbebbbecac455462a40b6056aa3821 (diff) | |
parent | 394e0f60c20206c7f7c4c76551d11a2b14b23a4d (diff) | |
download | dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.gz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.bz2 dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.lz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.xz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.zst dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.zip |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'chain/helper_test.go')
-rw-r--r-- | chain/helper_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chain/helper_test.go b/chain/helper_test.go index 59d1c4cca..642d19c95 100644 --- a/chain/helper_test.go +++ b/chain/helper_test.go @@ -4,11 +4,11 @@ import ( "container/list" "fmt" - "github.com/ethereum/go-ethereum/ethcrypto" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/ethwire" "github.com/ethereum/go-ethereum/event" + "github.com/ethereum/go-ethereum/wire" ) // Implement our EthTest Manager @@ -53,14 +53,14 @@ func (tm *TestManager) StateManager() *StateManager { func (tm *TestManager) EventMux() *event.TypeMux { return tm.eventMux } -func (tm *TestManager) Broadcast(msgType ethwire.MsgType, data []interface{}) { +func (tm *TestManager) Broadcast(msgType wire.MsgType, data []interface{}) { fmt.Println("Broadcast not implemented") } -func (tm *TestManager) ClientIdentity() ethwire.ClientIdentity { +func (tm *TestManager) ClientIdentity() wire.ClientIdentity { return nil } -func (tm *TestManager) KeyManager() *ethcrypto.KeyManager { +func (tm *TestManager) KeyManager() *crypto.KeyManager { return nil } |