diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:46:29 +0800 |
| commit | 5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (patch) | |
| tree | d5ba6197a8c0c8e36bb92ee9fc8aad717cb2d178 /core/manager.go | |
| parent | 8393dab470c40678caf36ada82e312d29c4cf5c4 (diff) | |
| parent | 22893b7ac925c49168c119f293ea8befc3aff5cc (diff) | |
| download | dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.gz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.bz2 dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.lz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.xz dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.tar.zst dexon-5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb.zip | |
Merge remote-tracking branch 'upstream/develop' into frontier/js
Conflicts:
cmd/ethereum/js.go
javascript/types.go
Diffstat (limited to 'core/manager.go')
| -rw-r--r-- | core/manager.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/manager.go b/core/manager.go index c4052cc05..9b5407a9e 100644 --- a/core/manager.go +++ b/core/manager.go @@ -1,7 +1,7 @@ package core import ( - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/p2p" ) @@ -13,7 +13,7 @@ type Backend interface { PeerCount() int IsListening() bool Peers() []*p2p.Peer - BlockDb() ethutil.Database - StateDb() ethutil.Database + BlockDb() common.Database + StateDb() common.Database EventMux() *event.TypeMux } |