From 6e9433c7a828186c46e88d5e6bea30bc3f9a5915 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Wed, 1 Nov 2017 02:05:27 -0400
Subject: [PATCH] post rebase fix

---
 consensus/types/state.go | 7 +++++--
 types/evidence.go        | 8 ++++++++
 types/evidence_test.go   | 8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/consensus/types/state.go b/consensus/types/state.go
index da4df6a4..06194711 100644
--- a/consensus/types/state.go
+++ b/consensus/types/state.go
@@ -74,6 +74,7 @@ type RoundState struct {
 	CommitRound        int            //
 	LastCommit         *types.VoteSet // Last precommits at Height-1
 	LastValidators     *types.ValidatorSet
+	Evidence           types.Evidences
 }
 
 // RoundStateEvent returns the H/R/S of the RoundState as an event.
@@ -107,8 +108,9 @@ func (rs *RoundState) StringIndented(indent string) string {
 %s  LockedRound:   %v
 %s  LockedBlock:   %v %v
 %s  Votes:         %v
-%s  LastCommit: %v
-%s  LastValidators:    %v
+%s  LastCommit:    %v
+%s  LastValidators:%v
+%s  Evidence:      %v
 %s}`,
 		indent, rs.Height, rs.Round, rs.Step,
 		indent, rs.StartTime,
@@ -121,6 +123,7 @@ func (rs *RoundState) StringIndented(indent string) string {
 		indent, rs.Votes.StringIndented(indent+"    "),
 		indent, rs.LastCommit.StringShort(),
 		indent, rs.LastValidators.StringIndented(indent+"    "),
+		indent, rs.Evidence.String(),
 		indent)
 }
 
diff --git a/types/evidence.go b/types/evidence.go
index e248eeb8..2756faf3 100644
--- a/types/evidence.go
+++ b/types/evidence.go
@@ -53,6 +53,14 @@ func (evs Evidences) Hash() []byte {
 	}
 }
 
+func (evs Evidences) String() string {
+	s := ""
+	for _, e := range evs {
+		s += fmt.Sprintf("%s\t\t", e)
+	}
+	return s
+}
+
 //-------------------------------------------
 
 // DuplicateVoteEvidence contains evidence a validator signed two conflicting votes.
diff --git a/types/evidence_test.go b/types/evidence_test.go
index a3f81154..a69040d4 100644
--- a/types/evidence_test.go
+++ b/types/evidence_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	cmn "github.com/tendermint/tmlibs/common"
 )
 
 type voteData struct {
@@ -12,7 +13,7 @@ type voteData struct {
 	valid bool
 }
 
-func makeVote(val *PrivValidator, chainID string, valIndex, height, round, step int, blockID BlockID) *Vote {
+func makeVote(val *PrivValidatorFS, chainID string, valIndex, height, round, step int, blockID BlockID) *Vote {
 	v := &Vote{
 		ValidatorAddress: val.PubKey.Address(),
 		ValidatorIndex:   valIndex,
@@ -39,8 +40,9 @@ func makeBlockID(hash string, partSetSize int, partSetHash string) BlockID {
 }
 
 func TestEvidence(t *testing.T) {
-	val := GenPrivValidator()
-	val2 := GenPrivValidator()
+	_, tmpFilePath := cmn.Tempfile("priv_validator_")
+	val := GenPrivValidatorFS(tmpFilePath)
+	val2 := GenPrivValidatorFS(tmpFilePath)
 	blockID := makeBlockID("blockhash", 1000, "partshash")
 	blockID2 := makeBlockID("blockhash2", 1000, "partshash")
 	blockID3 := makeBlockID("blockhash", 10000, "partshash")