diff options
author | zelig <viktor.tron@gmail.com> | 2014-12-15 02:19:29 +0800 |
---|---|---|
committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:30:56 +0800 |
commit | 39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3 (patch) | |
tree | e6803dbaf20c269b68eadd1140331b09852dc283 /core | |
parent | 5022a31889f87b95dd664cac2b049d5081e4af61 (diff) | |
download | dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar.gz dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar.bz2 dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar.lz dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar.xz dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.tar.zst dexon-39d86a28e7d27bf1f6a2e2e298b52614ee0b9be3.zip |
adapt to new eth pkg and p2p
Diffstat (limited to 'core')
-rw-r--r-- | core/block_manager.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/block_manager.go b/core/block_manager.go index f6c73bc2c..cf47218ed 100644 --- a/core/block_manager.go +++ b/core/block_manager.go @@ -2,7 +2,6 @@ package core import ( "bytes" - "container/list" "errors" "fmt" "math/big" @@ -14,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow/ezp" "github.com/ethereum/go-ethereum/state" - "github.com/ethereum/go-ethereum/wire" ) var statelogger = logger.NewLogger("BLOCK") @@ -38,13 +37,12 @@ type EthManager interface { BlockManager() *BlockManager ChainManager() *ChainManager TxPool() *TxPool - Broadcast(msgType wire.MsgType, data []interface{}) PeerCount() int IsMining() bool IsListening() bool - Peers() *list.List + Peers() []*p2p.Peer KeyManager() *crypto.KeyManager - ClientIdentity() wire.ClientIdentity + ClientIdentity() p2p.ClientIdentity Db() ethutil.Database EventMux() *event.TypeMux } |