diff --git a/consensus/lcp/api.go b/consensus/lcp/api.go index 1320d6c9c8..73d70cc5a4 100644 --- a/consensus/lcp/api.go +++ b/consensus/lcp/api.go @@ -21,7 +21,6 @@ import ( "github.com/pavelkrolevets/go-ethereum/consensus" "github.com/pavelkrolevets/go-ethereum/core/types" "github.com/pavelkrolevets/go-ethereum/rpc" - "github.com/pavelkrolevets/go-ethereum/trie" "math/big" ) @@ -44,7 +43,7 @@ func (api *API) GetValidators(number *rpc.BlockNumber) ([]common.Address, error) return nil, errUnknownBlock } - epochTrie, err := types.NewEpochTrie(header.LCPContext.EpochHash, trie.NewDatabase(api.lcp.db)) + epochTrie, err := types.NewEpochTrie(header.LCPContext.EpochHash, api.lcp.db) if err != nil { return nil, err } diff --git a/consensus/lcp/epoch_context_test.go b/consensus/lcp/epoch_context_test.go index 97cf77db26..5eb7399e64 100644 --- a/consensus/lcp/epoch_context_test.go +++ b/consensus/lcp/epoch_context_test.go @@ -8,8 +8,6 @@ import ( "github.com/pavelkrolevets/go-ethereum/core/state" "github.com/pavelkrolevets/go-ethereum/core/types" "github.com/pavelkrolevets/go-ethereum/ethdb" - "github.com/pavelkrolevets/go-ethereum/trie" - "github.com/stretchr/testify/assert" //types2 "github.com/pavelkrolevets/go-ethereum/core/types" ) @@ -32,9 +30,9 @@ func TestEpochContextCountVotes(t *testing.T) { } balance := int64(5) db := ethdb.NewMemDatabase() - bdb := trie.NewDatabase(db) + //bdb := trie.NewDatabase(db) stateDB, _ := state.New(common.Hash{}, state.NewDatabase(db)) - LCPContext, err := types.NewLCPContext(bdb) + LCPContext, err := types.NewLCPContext(db) assert.Nil(t, err) epochContext := &EpochContext{ diff --git a/consensus/lcp/lcp.go b/consensus/lcp/lcp.go index 9f0bc697f3..2812136cba 100644 --- a/consensus/lcp/lcp.go +++ b/consensus/lcp/lcp.go @@ -235,7 +235,7 @@ func (d *LCP) verifySeal(chain consensus.ChainReader, header *types.Header, pare } else { parent = chain.GetHeader(header.ParentHash, number-1) } - dposContext, err := types.NewLCPContextFromProto(trie.NewDatabase(d.db), parent.LCPContext) + dposContext, err := types.NewLCPContextFromProto(d.db, parent.LCPContext) if err != nil { return err } @@ -401,7 +401,7 @@ func (d *LCP) CheckValidator(lastBlock *types.Block, now int64) error { if err := d.checkDeadline(lastBlock, now); err != nil { return err } - dposContext, err := types.NewLCPContextFromProto(trie.NewDatabase(d.db), lastBlock.Header().LCPContext) + dposContext, err := types.NewLCPContextFromProto(d.db, lastBlock.Header().LCPContext) if err != nil { return err }