fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-25 10:41:41 +00:00
Code Issues Projects Releases Wiki Activity

[types] overwrite pubkey/addr in LoadPrivValidator. closes #500

Browse Source
This commit is contained in:
Ethan Buchman
2017-05-25 13:39:36 -04:00
parent fc6611b2d9
commit 42626d9e16
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
types/priv_validator.go
View File

@ -58,6 +58,7 @@ type PrivValidator struct {
// eg. to avoid double signing. // eg. to avoid double signing.
// Currently, the only callers are SignVote and SignProposal // Currently, the only callers are SignVote and SignProposal
type Signer interface { type Signer interface {
PubKey() crypto.PubKey
Sign(msg []byte) crypto.Signature Sign(msg []byte) crypto.Signature
} }
@ -75,8 +76,20 @@ func (ds *DefaultSigner) Sign(msg []byte) crypto.Signature {
return ds.priv.Sign(msg) return ds.priv.Sign(msg)
} }
// Implements Signer
func (ds *DefaultSigner) PubKey() crypto.PubKey {
return ds.priv.PubKey()
}
func (privVal *PrivValidator) SetSigner(s Signer) { func (privVal *PrivValidator) SetSigner(s Signer) {
privVal.Signer = s privVal.Signer = s
privVal.setPubKeyAndAddress()
}
// Overwrite address and pubkey for convenience
func (privVal *PrivValidator) setPubKeyAndAddress() {
privVal.PubKey = privVal.Signer.PubKey()
privVal.Address = privVal.PubKey.Address()
} }
// Generates a new validator with private key. // Generates a new validator with private key.
@ -103,8 +116,10 @@ func LoadPrivValidator(filePath string) *PrivValidator {
if err != nil { if err != nil {
Exit(Fmt("Error reading PrivValidator from %v: %v\n", filePath, err)) Exit(Fmt("Error reading PrivValidator from %v: %v\n", filePath, err))
} }
privVal.filePath = filePath privVal.filePath = filePath
privVal.Signer = NewDefaultSigner(privVal.PrivKey) privVal.Signer = NewDefaultSigner(privVal.PrivKey)
privVal.setPubKeyAndAddress()
return &privVal return &privVal
} }