more PrivValidator interface

This commit is contained in:
Ethan Buchman
2017-09-18 22:05:33 -04:00
parent fd1b0b997a
commit 944ebccfe9
11 changed files with 138 additions and 143 deletions

View File

@ -60,7 +60,7 @@ type Node struct {
func NewNodeDefault(config *cfg.Config, logger log.Logger) *Node {
// Get PrivValidator
privValidator := types.LoadOrGenPrivValidator(config.PrivValidatorFile())
privValidator := types.LoadOrGenPrivValidatorFS(config.PrivValidatorFile())
return NewNode(config, privValidator,
proxy.DefaultClientCreator(config.ProxyApp, config.ABCI, config.DBDir()), logger)
}
@ -125,7 +125,7 @@ func NewNode(config *cfg.Config, privValidator types.PrivValidator, clientCreato
}
// Log whether this node is a validator or an observer
if state.Validators.HasAddress(privValidator.PubKey().Address()) {
if state.Validators.HasAddress(privValidator.Address()) {
consensusLogger.Info("This node is a validator")
} else {
consensusLogger.Info("This node is not a validator")