diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
| commit | 7e0ccc9de53e788ddc1879248bceb33a9ccdbae0 (patch) | |
| tree | 816ff2e06aaa78721a22eee7f2c8493fbf313fb4 /core/manager.go | |
| parent | ce595b9266d658a5eae626d78aec7f47c04222ca (diff) | |
| parent | eba4f389a6c494bc3e15b3bbc6516b51a5e61236 (diff) | |
| download | dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.gz dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.zst dexon-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.zip | |
Merge branch 'develop' into rpcfrontier
Conflicts:
rpc/api.go
rpc/args.go
Diffstat (limited to 'core/manager.go')
| -rw-r--r-- | core/manager.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/manager.go b/core/manager.go index 803069377..c4052cc05 100644 --- a/core/manager.go +++ b/core/manager.go @@ -1,7 +1,6 @@ package core import ( - "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/p2p" @@ -14,7 +13,6 @@ type Backend interface { PeerCount() int IsListening() bool Peers() []*p2p.Peer - KeyManager() *crypto.KeyManager BlockDb() ethutil.Database StateDb() ethutil.Database EventMux() *event.TypeMux |