Fix test/p2p/pex circle tests; update consensus

This commit is contained in:
Jae Kwon
2018-06-27 14:31:42 -07:00
parent 8524a8da7f
commit b51ed132f7
6 changed files with 16 additions and 18 deletions

View File

@ -65,15 +65,9 @@ func (fc FullCommit) ValidateFull(chainID string) error {
}
// Validate the signatures on the commit.
hdr, cmt := fc.SignedHeader.Header, fc.SignedHeader.Commit
err = fc.Validators.VerifyCommit(
return fc.Validators.VerifyCommit(
hdr.ChainID, cmt.BlockID,
hdr.Height, cmt)
if err != nil {
return err
}
// All good!
return nil
}
// Height returns the height of the header.

View File

@ -241,10 +241,6 @@ func validatorSetKey(chainID string, height int64) []byte {
return []byte(fmt.Sprintf("%s/%010d/vs", chainID, height))
}
func chainKeyPrefix(chainID string, height int64) []byte {
return []byte(fmt.Sprintf("%s/%010d/", chainID, height))
}
var chainKeyPrefixPattern = regexp.MustCompile(`([^/]+)/([0-9]*)/`)
func parseChainKeyPrefix(key []byte) (chainID string, height int64, ok bool) {