diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
| commit | 9bf513e99305af733110cf23a0b47c8e73359010 (patch) | |
| tree | f9d36e1ae1f2f7c3eb803c7499a4e85a5cdcd5bd /core/manager.go | |
| parent | cd51860bf024d949a09b3863c88a278a386227a7 (diff) | |
| parent | 676a0de58d3d7c508b0eeeff192d2095a46f7382 (diff) | |
| download | dexon-9bf513e99305af733110cf23a0b47c8e73359010.tar.gz dexon-9bf513e99305af733110cf23a0b47c8e73359010.tar.zst dexon-9bf513e99305af733110cf23a0b47c8e73359010.zip | |
Merge ethereum/poc-9 into accounts-integration
Conflicts:
cmd/utils/cmd.go
cmd/utils/flags.go
core/manager.go
eth/backend.go
rpc/http/server.go
xeth/xeth.go
Diffstat (limited to 'core/manager.go')
| -rw-r--r-- | core/manager.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/manager.go b/core/manager.go index 29f786653..c4052cc05 100644 --- a/core/manager.go +++ b/core/manager.go @@ -13,6 +13,7 @@ type Backend interface { PeerCount() int IsListening() bool Peers() []*p2p.Peer - Db() ethutil.Database + BlockDb() ethutil.Database + StateDb() ethutil.Database EventMux() *event.TypeMux } |