generated privValidator for testing uses tmp files

PrivValidator.Sign*() and .Save() lock on a mutex
This commit is contained in:
Jae Kwon
2014-12-22 18:49:37 -08:00
parent 383335d93c
commit 403d24a4b2
5 changed files with 43 additions and 29 deletions

View File

@ -11,24 +11,24 @@ import (
// Common test methods
func makeValidator(votingPower uint64) (*state.Validator, *state.PrivValidator) {
privValidator := state.GenPrivValidator()
func makeValidator(valInfo *state.ValidatorInfo) *state.Validator {
return &state.Validator{
Address: privValidator.Address,
PubKey: privValidator.PubKey,
Address: valInfo.Address,
PubKey: valInfo.PubKey,
BondHeight: 0,
UnbondHeight: 0,
LastCommitHeight: 0,
VotingPower: votingPower,
VotingPower: valInfo.FirstBondAmount,
Accum: 0,
}, privValidator
}
}
func makeVoteSet(height uint, round uint, type_ byte, numValidators int, votingPower uint64) (*VoteSet, *state.ValidatorSet, []*state.PrivValidator) {
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)
for i := 0; i < numValidators; i++ {
val, privValidator := makeValidator(votingPower)
valInfo, privValidator := state.RandValidator(false, votingPower)
val := makeValidator(valInfo)
vals[i] = val
privValidators[i] = privValidator
}
@ -37,7 +37,7 @@ func makeVoteSet(height uint, round uint, type_ byte, numValidators int, votingP
return NewVoteSet(height, round, type_, valSet), valSet, privValidators
}
func makeConsensusState() (*ConsensusState, []*state.PrivValidator) {
func randConsensusState() (*ConsensusState, []*state.PrivValidator) {
state, _, privValidators := state.RandGenesisState(20, false, 1000, 10, false, 1000)
blockStore := NewBlockStore(db_.NewMemDB())
mempool := mempool_.NewMempool(state)