From a457a082a680578462024fb59487fe78d60bd1cd Mon Sep 17 00:00:00 2001 From: Chengcheng Zhang <943420582@qq.com> Date: Mon, 1 Jul 2019 21:32:41 +0800 Subject: [PATCH] update --- account/utxo_keeper_test.go | 68 --------------------------------------------- 1 file changed, 68 deletions(-) diff --git a/account/utxo_keeper_test.go b/account/utxo_keeper_test.go index f5f97bfd..91acee1d 100644 --- a/account/utxo_keeper_test.go +++ b/account/utxo_keeper_test.go @@ -12,11 +12,7 @@ import ( "github.com/vapor/blockchain/txbuilder" "github.com/vapor/crypto/ed25519/chainkd" dbm "github.com/vapor/database/leveldb" - "github.com/vapor/database/storage" - "github.com/vapor/protocol" "github.com/vapor/protocol/bc" - "github.com/vapor/protocol/bc/types" - "github.com/vapor/protocol/state" "github.com/vapor/testutil" ) @@ -1428,21 +1424,6 @@ func mockAccountManager(t *testing.T) *Manager { testDB := dbm.NewDB("testdb", "memdb", dirPath) accountStore := newMockAccountStore(testDB) - - // dispatcher := event.NewDispatcher() - // // store := database.NewStore(testDB) - // store := newMockStore(testDB) - // // accountStore := database.NewAccountStore(testDB) - // accountStore := newMockAccountStore(testDB) - // txPool := protocol.NewTxPool(store, dispatcher) - // config.CommonConfig = config.DefaultConfig() - // chain, err := protocol.NewChain(store, txPool, dispatcher) - // if err != nil { - // t.Fatal(err) - // } - - // return NewManager(accountStore, chain) - bestBlockHeight := func() uint64 { return 9527 } return &Manager{ @@ -1454,52 +1435,3 @@ func mockAccountManager(t *testing.T) *Manager { delayedACPs: make(map[*txbuilder.TemplateBuilder][]*CtrlProgram), } } - -type mockStore struct { - db dbm.DB - // cache cache -} - -// newStore creates and returns a new Store object. -func newMockStore(db dbm.DB) *mockStore { - // fillBlockHeaderFn := func(hash *bc.Hash) (*types.BlockHeader, error) { - // return GetBlockHeader(db, hash) - // } - // fillBlockTxsFn := func(hash *bc.Hash) ([]*types.Tx, error) { - // return GetBlockTransactions(db, hash) - // } - - // fillBlockHashesFn := func(height uint64) ([]*bc.Hash, error) { - // return GetBlockHashesByHeight(db, height) - // } - - // fillMainChainHashFn := func(height uint64) (*bc.Hash, error) { - // return GetMainChainHash(db, height) - // } - - // fillVoteResultFn := func(seq uint64) (*state.VoteResult, error) { - // return GetVoteResult(db, seq) - // } - - // cache := newCache(fillBlockHeaderFn, fillBlockTxsFn, fillBlockHashesFn, fillMainChainHashFn, fillVoteResultFn) - return &mockStore{ - db: db, - // cache: nil, - } -} - -func (s *mockStore) BlockExist(*bc.Hash) bool { return false } -func (s *mockStore) GetBlock(*bc.Hash) (*types.Block, error) { return nil, nil } -func (s *mockStore) GetBlockHeader(*bc.Hash) (*types.BlockHeader, error) { return nil, nil } -func (s *mockStore) GetStoreStatus() *protocol.BlockStoreState { return nil } -func (s *mockStore) GetTransactionStatus(*bc.Hash) (*bc.TransactionStatus, error) { return nil, nil } -func (s *mockStore) GetTransactionsUtxo(*state.UtxoViewpoint, []*bc.Tx) error { return nil } -func (s *mockStore) GetUtxo(*bc.Hash) (*storage.UtxoEntry, error) { return nil, nil } -func (s *mockStore) GetVoteResult(uint64) (*state.VoteResult, error) { return nil, nil } -func (s *mockStore) GetMainChainHash(uint64) (*bc.Hash, error) { return nil, nil } -func (s *mockStore) GetBlockHashesByHeight(uint64) ([]*bc.Hash, error) { return nil, nil } -func (s *mockStore) SaveBlock(*types.Block, *bc.TransactionStatus) error { return nil } -func (s *mockStore) SaveBlockHeader(*types.BlockHeader) error { return nil } -func (s *mockStore) SaveChainStatus(*types.BlockHeader, *types.BlockHeader, []*types.BlockHeader, *state.UtxoViewpoint, []*state.VoteResult) error { - return nil -} -- 2.11.0