X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Ftxpool_test.go;h=7b96cb0b564436473b44e5438523becb0d66e61a;hb=32605ab49e746065f4b5a68301ce080d1576c6ef;hp=c3891336ac6cdf0059f386de08042b4fc3582cd5;hpb=6f7fe6fd7442ddcec8ee959c09b6d45639ef045f;p=bytom%2Fvapor.git diff --git a/protocol/txpool_test.go b/protocol/txpool_test.go index c3891336..7b96cb0b 100644 --- a/protocol/txpool_test.go +++ b/protocol/txpool_test.go @@ -113,17 +113,19 @@ type mockStore struct{} func (s *mockStore) BlockExist(hash *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() *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) LoadBlockIndex(uint64) (*state.BlockIndex, error) { return nil, nil } +func (s *mockStore) GetConsensusResult(uint64) (*state.ConsensusResult, 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) SaveChainStatus(*state.BlockNode, *state.BlockNode, *state.UtxoViewpoint, map[uint64]*state.VoteResult) error { +func (s *mockStore) SaveBlockHeader(*types.BlockHeader) error { return nil } +func (s *mockStore) SaveChainStatus(*types.BlockHeader, *types.BlockHeader, []*types.BlockHeader, *state.UtxoViewpoint, []*state.ConsensusResult) error { return nil } -func (s *mockStore) SaveChainNodeStatus(*state.BlockNode, *state.BlockNode) error { return nil } func TestAddOrphan(t *testing.T) { cases := []struct { @@ -656,6 +658,7 @@ type mockStore1 struct{} func (s *mockStore1) BlockExist(hash *bc.Hash) bool { return false } func (s *mockStore1) GetBlock(*bc.Hash) (*types.Block, error) { return nil, nil } +func (s *mockStore1) GetBlockHeader(*bc.Hash) (*types.BlockHeader, error) { return nil, nil } func (s *mockStore1) GetStoreStatus() *BlockStoreState { return nil } func (s *mockStore1) GetTransactionStatus(*bc.Hash) (*bc.TransactionStatus, error) { return nil, nil } func (s *mockStore1) GetTransactionsUtxo(utxoView *state.UtxoViewpoint, tx []*bc.Tx) error { @@ -666,13 +669,14 @@ func (s *mockStore1) GetTransactionsUtxo(utxoView *state.UtxoViewpoint, tx []*bc return nil } func (s *mockStore1) GetUtxo(*bc.Hash) (*storage.UtxoEntry, error) { return nil, nil } -func (s *mockStore1) GetVoteResult(uint64) (*state.VoteResult, error) { return nil, nil } -func (s *mockStore1) LoadBlockIndex(uint64) (*state.BlockIndex, error) { return nil, nil } +func (s *mockStore1) GetConsensusResult(uint64) (*state.ConsensusResult, error) { return nil, nil } +func (s *mockStore1) GetMainChainHash(uint64) (*bc.Hash, error) { return nil, nil } +func (s *mockStore1) GetBlockHashesByHeight(uint64) ([]*bc.Hash, error) { return nil, nil } func (s *mockStore1) SaveBlock(*types.Block, *bc.TransactionStatus) error { return nil } -func (s *mockStore1) SaveChainStatus(*state.BlockNode, *state.BlockNode, *state.UtxoViewpoint, map[uint64]*state.VoteResult) error { +func (s *mockStore1) SaveBlockHeader(*types.BlockHeader) error { return nil } +func (s *mockStore1) SaveChainStatus(*types.BlockHeader, *types.BlockHeader, []*types.BlockHeader, *state.UtxoViewpoint, []*state.ConsensusResult) error { return nil } -func (s *mockStore1) SaveChainNodeStatus(*state.BlockNode, *state.BlockNode) error { return nil } func TestProcessTransaction(t *testing.T) { txPool := &TxPool{