mirror of
https://github.com/fluencelabs/tendermint
synced 2025-07-02 22:21:44 +00:00
Dot import -> named import
Changed modulename_ to short module names Also removed Unreader, replaced with PrefixdReader in select locations
This commit is contained in:
@ -3,16 +3,16 @@ package consensus
|
||||
import (
|
||||
"sort"
|
||||
|
||||
. "github.com/tendermint/tendermint/block"
|
||||
db_ "github.com/tendermint/tendermint/db"
|
||||
mempool_ "github.com/tendermint/tendermint/mempool"
|
||||
"github.com/tendermint/tendermint/state"
|
||||
"github.com/tendermint/tendermint/block"
|
||||
dbm "github.com/tendermint/tendermint/db"
|
||||
mempl "github.com/tendermint/tendermint/mempool"
|
||||
sm "github.com/tendermint/tendermint/state"
|
||||
)
|
||||
|
||||
// Common test methods
|
||||
|
||||
func makeValidator(valInfo *state.ValidatorInfo) *state.Validator {
|
||||
return &state.Validator{
|
||||
func makeValidator(valInfo *sm.ValidatorInfo) *sm.Validator {
|
||||
return &sm.Validator{
|
||||
Address: valInfo.Address,
|
||||
PubKey: valInfo.PubKey,
|
||||
BondHeight: 0,
|
||||
@ -23,25 +23,25 @@ func makeValidator(valInfo *state.ValidatorInfo) *state.Validator {
|
||||
}
|
||||
}
|
||||
|
||||
func randVoteSet(height uint, round uint, type_ byte, numValidators int, votingPower uint64) (*VoteSet, *state.ValidatorSet, []*state.PrivValidator) {
|
||||
vals := make([]*state.Validator, numValidators)
|
||||
privValidators := make([]*state.PrivValidator, numValidators)
|
||||
func randVoteSet(height uint, round uint, type_ byte, numValidators int, votingPower uint64) (*VoteSet, *sm.ValidatorSet, []*sm.PrivValidator) {
|
||||
vals := make([]*sm.Validator, numValidators)
|
||||
privValidators := make([]*sm.PrivValidator, numValidators)
|
||||
for i := 0; i < numValidators; i++ {
|
||||
valInfo, privValidator := state.RandValidator(false, votingPower)
|
||||
valInfo, privValidator := sm.RandValidator(false, votingPower)
|
||||
val := makeValidator(valInfo)
|
||||
vals[i] = val
|
||||
privValidators[i] = privValidator
|
||||
}
|
||||
valSet := state.NewValidatorSet(vals)
|
||||
sort.Sort(state.PrivValidatorsByAddress(privValidators))
|
||||
valSet := sm.NewValidatorSet(vals)
|
||||
sort.Sort(sm.PrivValidatorsByAddress(privValidators))
|
||||
return NewVoteSet(height, round, type_, valSet), valSet, privValidators
|
||||
}
|
||||
|
||||
func randConsensusState() (*ConsensusState, []*state.PrivValidator) {
|
||||
state, _, privValidators := state.RandGenesisState(20, false, 1000, 10, false, 1000)
|
||||
blockStore := NewBlockStore(db_.NewMemDB())
|
||||
mempool := mempool_.NewMempool(state)
|
||||
mempoolReactor := mempool_.NewMempoolReactor(mempool)
|
||||
func randConsensusState() (*ConsensusState, []*sm.PrivValidator) {
|
||||
state, _, privValidators := sm.RandGenesisState(20, false, 1000, 10, false, 1000)
|
||||
blockStore := block.NewBlockStore(dbm.NewMemDB())
|
||||
mempool := mempl.NewMempool(state)
|
||||
mempoolReactor := mempl.NewMempoolReactor(mempool)
|
||||
cs := NewConsensusState(state, blockStore, mempoolReactor)
|
||||
return cs, privValidators
|
||||
}
|
||||
|
Reference in New Issue
Block a user