forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ADDED LCP engine

Browse source
This commit is contained in:
pavelkrolevets 2018-08-21 15:36:42 +08:00
parent e232ba43a3
commit 27d3f0ee3a
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
consensus/lcp/api.go
View file

@ -21,7 +21,6 @@ import (
"github.com/pavelkrolevets/go-ethereum/consensus" "github.com/pavelkrolevets/go-ethereum/consensus"
"github.com/pavelkrolevets/go-ethereum/core/types" "github.com/pavelkrolevets/go-ethereum/core/types"
"github.com/pavelkrolevets/go-ethereum/rpc" "github.com/pavelkrolevets/go-ethereum/rpc"
"github.com/pavelkrolevets/go-ethereum/trie"
"math/big" "math/big"
) )
@ -44,7 +43,7 @@ func (api *API) GetValidators(number *rpc.BlockNumber) ([]common.Address, error)
return nil, errUnknownBlock 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 { if err != nil {
return nil, err return nil, err
} }

6
consensus/lcp/epoch_context_test.go
View file

@ -8,8 +8,6 @@ import (
"github.com/pavelkrolevets/go-ethereum/core/state" "github.com/pavelkrolevets/go-ethereum/core/state"
"github.com/pavelkrolevets/go-ethereum/core/types" "github.com/pavelkrolevets/go-ethereum/core/types"
"github.com/pavelkrolevets/go-ethereum/ethdb" "github.com/pavelkrolevets/go-ethereum/ethdb"
"github.com/pavelkrolevets/go-ethereum/trie"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
//types2 "github.com/pavelkrolevets/go-ethereum/core/types" //types2 "github.com/pavelkrolevets/go-ethereum/core/types"
) )
@ -32,9 +30,9 @@ func TestEpochContextCountVotes(t *testing.T) {
} }
balance := int64(5) balance := int64(5)
db := ethdb.NewMemDatabase() db := ethdb.NewMemDatabase()
bdb := trie.NewDatabase(db) //bdb := trie.NewDatabase(db)
stateDB, _ := state.New(common.Hash{}, state.NewDatabase(db)) stateDB, _ := state.New(common.Hash{}, state.NewDatabase(db))
LCPContext, err := types.NewLCPContext(bdb) LCPContext, err := types.NewLCPContext(db)
assert.Nil(t, err) assert.Nil(t, err)
epochContext := &EpochContext{ epochContext := &EpochContext{

4
consensus/lcp/lcp.go
View file

@ -235,7 +235,7 @@ func (d *LCP) verifySeal(chain consensus.ChainReader, header *types.Header, pare
} else { } else {
parent = chain.GetHeader(header.ParentHash, number-1) 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 { if err != nil {
return err return err
} }
@ -401,7 +401,7 @@ func (d *LCP) CheckValidator(lastBlock *types.Block, now int64) error {
if err := d.checkDeadline(lastBlock, now); err != nil { if err := d.checkDeadline(lastBlock, now); err != nil {
return err 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 { if err != nil {
return err return err
} }