mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-10 05:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

types: Fix legibility nits

Browse Source 
Signed-off-by: Thane Thomson <connect@thanethomson.com>
This commit is contained in:
Thane Thomson
2022-05-04 17:58:22 -04:00
parent d0102e6b7e
commit 2ef2733723
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
types/block.go
View File

@@ -1087,8 +1087,8 @@ func (ec *ExtendedCommit) Clone() *ExtendedCommit {
// Inverse of VoteSet.MakeCommit().
func (ec *ExtendedCommit) ToVoteSet(chainID string, vals *ValidatorSet) *VoteSet {
voteSet := NewVoteSet(chainID, ec.Height, ec.Round, tmproto.PrecommitType, vals)
for idx, extCommitSig := range ec.ExtendedSignatures {
if extCommitSig.Absent() {
for idx, sig := range ec.ExtendedSignatures {
if sig.Absent() {
continue // OK, some precommits can be missing.
}
vote := ec.GetExtendedVote(int32(idx))
@@ -1107,12 +1107,12 @@ func (ec *ExtendedCommit) ToVoteSet(chainID string, vals *ValidatorSet) *VoteSet
// extension-related fields.
func (ec *ExtendedCommit) StripExtensions() *Commit {
commitSigs := make([]CommitSig, len(ec.ExtendedSignatures))
for idx, extCommitSig := range ec.ExtendedSignatures {
for idx, sig := range ec.ExtendedSignatures {
commitSigs[idx] = CommitSig{
BlockIDFlag: extCommitSig.BlockIDFlag,
ValidatorAddress: extCommitSig.ValidatorAddress,
Timestamp: extCommitSig.Timestamp,
Signature: extCommitSig.Signature,
BlockIDFlag: sig.BlockIDFlag,
ValidatorAddress: sig.ValidatorAddress,
Timestamp: sig.Timestamp,
Signature: sig.Signature,
}
}
return &Commit{
@@ -1123,31 +1123,29 @@ func (ec *ExtendedCommit) StripExtensions() *Commit {
}
}
// GetExtendedVote converts the ExtendedCommitSig for the given valIdx to a
// Vote with vote extensions.
// Panics if valIdx >= extCommit.Size().
func (ec *ExtendedCommit) GetExtendedVote(valIdx int32) *Vote {
commitSig := ec.ExtendedSignatures[valIdx]
// GetExtendedVote converts the ExtendedCommitSig for the given validator
// index to a Vote with a vote extensions.
// It panics if valIndex is out of range.
func (ec *ExtendedCommit) GetExtendedVote(valIndex int32) *Vote {
sig := ec.ExtendedSignatures[valIndex]
return &Vote{
Type: tmproto.PrecommitType,
Height: ec.Height,
Round: ec.Round,
BlockID: commitSig.BlockID(ec.BlockID),
Timestamp: commitSig.Timestamp,
ValidatorAddress: commitSig.ValidatorAddress,
ValidatorIndex: valIdx,
Signature: commitSig.Signature,
Extension: commitSig.VoteExtension,
ExtensionSignature: commitSig.ExtensionSignature,
BlockID: sig.BlockID(ec.BlockID),
Timestamp: sig.Timestamp,
ValidatorAddress: sig.ValidatorAddress,
ValidatorIndex: valIndex,
Signature: sig.Signature,
Extension: sig.VoteExtension,
ExtensionSignature: sig.ExtensionSignature,
}
}
// Type returns the vote type of the extended commit, which is always
// VoteTypePrecommit
// Implements VoteSetReader.
func (ec *ExtendedCommit) Type() byte {
return byte(tmproto.PrecommitType)
}
func (ec *ExtendedCommit) Type() byte { return byte(tmproto.PrecommitType) }
// GetHeight returns height of the extended commit.
// Implements VoteSetReader.