mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-06 08:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documented Block, some renames

Browse Source
This commit is contained in:
Jae Kwon
2014-12-23 01:35:54 -08:00
parent 403d24a4b2
commit 62ff48c02b
12 changed files with 174 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
consensus/pol.go
+1 -1
View File
@@ -86,7 +86,7 @@ func (pol *POL) Verify(valSet *state.ValidatorSet) error {
}
func (pol *POL) Description() string {
func (pol *POL) StringShort() string {
if pol == nil {
return "nil-POL"
} else {
consensus/state.go
+14 -13
View File
@@ -131,10 +131,10 @@ type RoundState struct {
}
func (rs *RoundState) String() string {
return rs.StringWithIndent("")
return rs.StringIndented("")
}
func (rs *RoundState) StringWithIndent(indent string) string {
func (rs *RoundState) StringIndented(indent string) string {
return fmt.Sprintf(`RoundState{
%s H:%v R:%v S:%v
%s StartTime: %v
@@ -153,20 +153,20 @@ func (rs *RoundState) StringWithIndent(indent string) string {
indent, rs.Height, rs.Round, rs.Step,
indent, rs.StartTime,
indent, rs.CommitTime,
indent, rs.Validators.StringWithIndent(indent+" "),
indent, rs.Validators.StringIndented(indent+" "),
indent, rs.Proposal,
indent, rs.ProposalBlockParts.Description(), rs.ProposalBlock.Description(),
indent, rs.ProposalPOLParts.Description(), rs.ProposalPOL.Description(),
indent, rs.LockedBlockParts.Description(), rs.LockedBlock.Description(),
indent, rs.LockedPOL.Description(),
indent, rs.Prevotes.StringWithIndent(indent+" "),
indent, rs.Precommits.StringWithIndent(indent+" "),
indent, rs.Commits.StringWithIndent(indent+" "),
indent, rs.LastCommits.Description(),
indent, rs.ProposalBlockParts.StringShort(), rs.ProposalBlock.StringShort(),
indent, rs.ProposalPOLParts.StringShort(), rs.ProposalPOL.StringShort(),
indent, rs.LockedBlockParts.StringShort(), rs.LockedBlock.StringShort(),
indent, rs.LockedPOL.StringShort(),
indent, rs.Prevotes.StringIndented(indent+" "),
indent, rs.Precommits.StringIndented(indent+" "),
indent, rs.Commits.StringIndented(indent+" "),
indent, rs.LastCommits.StringShort(),
indent)
}
func (rs *RoundState) Description() string {
func (rs *RoundState) StringShort() string {
return fmt.Sprintf(`RS{%v/%v/%X %v}`,
rs.Height, rs.Round, rs.Step, rs.StartTime)
}
@@ -306,7 +306,7 @@ ACTION_LOOP:
height, round, action := roundAction.Height, roundAction.Round, roundAction.Action
rs := cs.GetRoundState()
log.Info("Running round action A:%X %v", action, rs.Description())
log.Info("Running round action A:%X %v", action, rs.StringShort())
// Continue if action is not relevant
if height != rs.Height {
@@ -545,6 +545,7 @@ func (cs *ConsensusState) RunActionPropose(height uint, round uint) {
Height: cs.Height,
Time: time.Now(),
Fees: 0, // TODO fees
NumTxs: uint(len(txs)),
LastBlockHash: cs.state.LastBlockHash,
LastBlockParts: cs.state.LastBlockParts,
StateHash: nil, // Will set afterwards.
consensus/vote_set.go
+4 -4
View File
@@ -247,14 +247,14 @@ func (voteSet *VoteSet) MakeValidation() *Validation {
}
func (voteSet *VoteSet) String() string {
return voteSet.StringWithIndent("")
return voteSet.StringIndented("")
}
func (voteSet *VoteSet) StringWithIndent(indent string) string {
func (voteSet *VoteSet) StringIndented(indent string) string {
voteStrings := make([]string, len(voteSet.votes))
for i, vote := range voteSet.votes {
if vote == nil {
voteStrings[i] = "nil"
voteStrings[i] = "nil-Vote"
} else {
voteStrings[i] = vote.String()
}
@@ -270,7 +270,7 @@ func (voteSet *VoteSet) StringWithIndent(indent string) string {
indent)
}
func (voteSet *VoteSet) Description() string {
func (voteSet *VoteSet) StringShort() string {
if voteSet == nil {
return "nil-VoteSet"
}