add mock

diff --git a/toolbar/precog/monitor/mock.go b/toolbar/precog/monitor/mock.go
new file mode 100644 (file)
index 0000000..792e114
--- /dev/null
+++ b/toolbar/precog/monitor/mock.go
@@ -0,0 +1,51 @@
+package monitor
+
+import (
+       "github.com/vapor/protocol/bc"
+       "github.com/vapor/protocol/bc/types"
+)
+
+type mockChain struct{}
+
+func (m *mockChain) BestBlockHeader() *types.BlockHeader {
+       return &types.BlockHeader{}
+}
+
+func (m *mockChain) BestBlockHeight() uint64 {
+       return 0
+}
+
+func (m *mockChain) GetBlockByHash(*bc.Hash) (*types.Block, error) {
+       return &types.Block{}, nil
+}
+
+func (m *mockChain) GetBlockByHeight(uint64) (*types.Block, error) {
+       return &types.Block{}, nil
+}
+
+func (m *mockChain) GetHeaderByHash(*bc.Hash) (*types.BlockHeader, error) {
+       return &types.BlockHeader{}, nil
+}
+
+func (m *mockChain) GetHeaderByHeight(uint64) (*types.BlockHeader, error) {
+       return &types.BlockHeader{}, nil
+}
+
+func (m *mockChain) GetTransactionStatus(*bc.Hash) (*bc.TransactionStatus, error) {
+       return &bc.TransactionStatus{}, nil
+}
+
+type mockTxPool struct{}
+type mockFastSyncDB struct{}
+
+func (m *mockFastSyncDB) Close() {
+}
+
+func (m *mockFastSyncDB) Delete([]byte) {
+}
+
+func (m *mockFastSyncDB) DeleteSync([]byte) {
+}
+
+func (m *mockFastSyncDB) Get([]byte) []byte {
+}

diff --git a/toolbar/precog/monitor/monitor.go b/toolbar/precog/monitor/monitor.go
index 7429d90..52f1f23 100644 (file)
--- a/toolbar/precog/monitor/monitor.go
+++ b/toolbar/precog/monitor/monitor.go
@@ -19,11 +19,13 @@ import (
        "github.com/vapor/crypto/ed25519/chainkd"
        "github.com/vapor/event"
        "github.com/vapor/p2p"
+       // "github.com/vapor/protocol/bc/types"
        // conn "github.com/vapor/p2p/connection"
        "github.com/vapor/netsync/peers"
        // "github.com/vapor/consensus"
        // "github.com/vapor/crypto/sha3pool"
-       "github.com/vapor/netsync/consensusmgr"
+       // "github.com/vapor/netsync/consensusmgr"
+       "github.com/vapor/netsync/chainmgr"
        "github.com/vapor/p2p/discover/dht"
        "github.com/vapor/p2p/discover/mdns"
        "github.com/vapor/p2p/signlib"
@@ -211,16 +213,25 @@ func (m *monitor) checkStatusRoutine() {
        peers := peers.NewPeerSet(m.sw)
        dispatcher := event.NewDispatcher()
        // TODO: mockchain?
-       // consensusMgr := consensusmgr.NewManager(sw, chain, peers, dispatcher)
-       consensusMgr := consensusmgr.NewManager(m.sw, nil, peers, dispatcher)
        // TODO: ???
-       consensusMgr.Start()
-       // TODO: change name?
+       // consensusMgr := consensusmgr.NewManager(sw, chain, peers, dispatcher)
+       // consensusMgr := consensusmgr.NewManager(m.sw, nil, peers, dispatcher)
+       // consensusMgr.Start()
+       //
+
+       // chainMgr, err := chainmgr.NewManager(m.nodeCfg, m.sw, chain, txPool, dispatcher, peers, fastSyncDB)
+       chainMgr, err := chainmgr.NewManager(m.nodeCfg, m.sw, &mockChain{}, &mockTxPool{}, dispatcher, peers, &mockFastSyncDB{})
+       if err != nil {
+               log.Fatal(err)
+       }
+
+       for k, v := range m.sw.GetReactors() {
+               log.Debug("start", k, ",", v)
+               v.Start()
+       }
        ticker := time.NewTicker(time.Duration(m.cfg.CheckFreqSeconds) * time.Second)
        for ; true; <-ticker.C {
-               for k, v := range m.sw.GetReactors() {
-                       v.Start()
-                       log.Debug(k, ",", v)
+               for _, v := range m.sw.GetReactors() {
                        for _, peer := range m.sw.GetPeers().List() {
                                log.Debug("AddPeer for", v, peer)
                                // TODO: if not in sw