fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-30 05:01:44 +00:00
Code Issues Projects Releases Wiki Activity

types: evidence cleanup

Browse Source
This commit is contained in:
Ethan Buchman
2017-11-19 22:18:43 +00:00
parent 4854c231e1
commit 3271634e7a
5 changed files with 24 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
types/block.go
View File

@ -43,7 +43,7 @@ func MakeBlock(height int64, txs []Tx, commit *Commit) *Block {
// AddEvidence appends the given evidence to the block
func (b *Block) AddEvidence(evidence []Evidence) {
b.Evidence.Evidences = append(b.Evidence.Evidences, evidence...)
b.Evidence.Evidence = append(b.Evidence.Evidence, evidence...)
}
// ValidateBasic performs basic validation that doesn't involve state data.
@ -437,8 +437,7 @@ func (data *Data) StringIndented(indent string) string {
// EvidenceData contains any evidence of malicious wrong-doing by validators
type EvidenceData struct {
// TODO: FIXME
Evidences evidences `json:"evidence"`
Evidence EvidenceList `json:"evidence"`
// Volatile
hash data.Bytes
@ -447,7 +446,7 @@ type EvidenceData struct {
// Hash returns the hash of the data.
func (data *EvidenceData) Hash() data.Bytes {
if data.hash == nil {
data.hash = data.Evidences.Hash()
data.hash = data.Evidence.Hash()
}
return data.hash
}
@ -457,10 +456,10 @@ func (data *EvidenceData) StringIndented(indent string) string {
if data == nil {
return "nil-Evidence"
}
evStrings := make([]string, cmn.MinInt(len(data.Evidences), 21))
for i, ev := range data.Evidences {
evStrings := make([]string, cmn.MinInt(len(data.Evidence), 21))
for i, ev := range data.Evidence {
if i == 20 {
evStrings[i] = fmt.Sprintf("... (%v total)", len(data.Evidences))
evStrings[i] = fmt.Sprintf("... (%v total)", len(data.Evidence))
break
}
evStrings[i] = fmt.Sprintf("Evidence:%v", ev)