X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=netsync%2Fchainmgr%2Ftool_test.go;h=db17b4ff62e3af3495922a05183559995e0e2668;hp=34f0cc6eb710c7ca0609408debf00d38f4694b30;hb=54373c1a3efe0e373ec1605840a4363e4b246c46;hpb=7e01ede3ce5d3688fa29f30bc766593beb9508e4

diff --git a/netsync/chainmgr/tool_test.go b/netsync/chainmgr/tool_test.go
index 34f0cc6e..db17b4ff 100644
--- a/netsync/chainmgr/tool_test.go
+++ b/netsync/chainmgr/tool_test.go
@@ -21,7 +21,7 @@ type P2PPeer struct {
 	flag consensus.ServiceFlag
 
 	srcPeer    *P2PPeer
-	remoteNode *ChainManager
+	remoteNode *Manager
 	msgCh      chan []byte
 	async      bool
 }
@@ -52,7 +52,7 @@ func (p *P2PPeer) ServiceFlag() consensus.ServiceFlag {
 	return p.flag
 }
 
-func (p *P2PPeer) SetConnection(srcPeer *P2PPeer, node *ChainManager) {
+func (p *P2PPeer) SetConnection(srcPeer *P2PPeer, node *Manager) {
 	p.srcPeer = srcPeer
 	p.remoteNode = node
 }
@@ -89,23 +89,26 @@ func NewPeerSet() *PeerSet {
 	return &PeerSet{}
 }
 
-func (ps *PeerSet) AddBannedPeer(string) error { return nil }
-func (ps *PeerSet) StopPeerGracefully(string)  {}
+func (ps *PeerSet) IsBanned(peerID string, level byte, reason string) bool {
+	return false
+}
+
+func (ps *PeerSet) StopPeerGracefully(string) {}
 
 type NetWork struct {
-	nodes map[*ChainManager]P2PPeer
+	nodes map[*Manager]P2PPeer
 }
 
 func NewNetWork() *NetWork {
-	return &NetWork{map[*ChainManager]P2PPeer{}}
+	return &NetWork{map[*Manager]P2PPeer{}}
 }
 
-func (nw *NetWork) Register(node *ChainManager, addr, id string, flag consensus.ServiceFlag) {
+func (nw *NetWork) Register(node *Manager, addr, id string, flag consensus.ServiceFlag) {
 	peer := NewP2PPeer(addr, id, flag)
 	nw.nodes[node] = *peer
 }
 
-func (nw *NetWork) HandsShake(nodeA, nodeB *ChainManager) (*P2PPeer, *P2PPeer, error) {
+func (nw *NetWork) HandsShake(nodeA, nodeB *Manager) (*P2PPeer, *P2PPeer, error) {
 	B2A, ok := nw.nodes[nodeA]
 	if !ok {
 		return nil, nil, errors.New("can't find nodeA's p2p peer on network")
@@ -150,18 +153,20 @@ func mockBlocks(startBlock *types.Block, height uint64) []*types.Block {
 	return blocks
 }
 
-func mockSync(blocks []*types.Block) *ChainManager {
-	chain := mock.NewChain()
+func mockSync(blocks []*types.Block, mempool *mock.Mempool) *Manager {
+	chain := mock.NewChain(mempool)
 	peers := peers.NewPeerSet(NewPeerSet())
 	chain.SetBestBlockHeader(&blocks[len(blocks)-1].BlockHeader)
 	for _, block := range blocks {
 		chain.SetBlockByHeight(block.Height, block)
 	}
 
-	return &ChainManager{
+	return &Manager{
 		chain:       chain,
 		blockKeeper: newBlockKeeper(chain, peers),
 		peers:       peers,
+		mempool:     mempool,
+		txSyncCh:    make(chan *txSyncMsg),
 	}
 }