evidence: structs can independently form abci evidence (#5610)

test/e2e/generator/generate.go

@@ -41,11 +41,8 @@ var (
 		"restart":    0.1,
 	}
 	nodeMisbehaviors = weightedChoice{
-		// FIXME Disabled due to:
-		// https://github.com/tendermint/tendermint/issues/5554
-		// https://github.com/tendermint/tendermint/issues/5560
-		// misbehaviorOption{"double-prevote"}: 1,
-		misbehaviorOption{}: 9,
+		misbehaviorOption{"double-prevote"}: 1,
+		misbehaviorOption{}:                 9,
 	}
 )
 

test/e2e/networks/ci.toml

@@ -36,10 +36,7 @@ seeds = ["seed01"]
 seeds = ["seed01"]
 snapshot_interval = 5
 perturb = ["disconnect"]
-# FIXME Evidence handling causes panics and halts
-# https://github.com/tendermint/tendermint/issues/5554
-# https://github.com/tendermint/tendermint/issues/5560
-#misbehaviors = { 1012 = "double-prevote", 1018 = "double-prevote" }
+misbehaviors = { 1018 = "double-prevote" }
 
 [node.validator02]
 seeds = ["seed02"]
@@ -62,7 +59,6 @@ perturb = ["kill"]
 persistent_peers = ["validator01"]
 database = "rocksdb"
 abci_protocol = "builtin"
-retain_blocks = 1
 perturb = ["pause"]
 
 [node.validator05]
@@ -81,6 +77,7 @@ mode = "full"
 # https://github.com/tendermint/tendermint/issues/5444
 fast_sync = "v2"
 persistent_peers = ["validator01", "validator02", "validator03", "validator04", "validator05"]
+retain_blocks = 1
 perturb = ["restart"]
 
 [node.full02]

test/e2e/tests/evidence_test.go

@@ -10,11 +10,12 @@ import (
 	"github.com/tendermint/tendermint/types"
 )
 
-// assert that all nodes that have blocks during the height (or height + 1) of a misbehavior has evidence
+// assert that all nodes that have blocks at the height of a misbehavior has evidence
 // for that misbehavior
 func TestEvidence_Misbehavior(t *testing.T) {
 	blocks := fetchBlockChain(t)
 	testNode(t, func(t *testing.T, node e2e.Node) {
+		seenEvidence := make(map[int64]struct{})
 		for _, block := range blocks {
 			// Find any evidence blaming this node in this block
 			var nodeEvidence types.Evidence
@@ -28,16 +29,14 @@ func TestEvidence_Misbehavior(t *testing.T) {
 					t.Fatalf("unexpected evidence type %T", evidence)
 				}
 			}
-
-			// Check that evidence was as expected (evidence is submitted in following height)
-			misbehavior, ok := node.Misbehaviors[block.Height-1]
-			if !ok {
-				require.Nil(t, nodeEvidence, "found unexpected evidence %v in height %v",
-					nodeEvidence, block.Height)
-				continue
+			if nodeEvidence == nil {
+				continue // no evidence for the node at this height
 			}
-			require.NotNil(t, nodeEvidence, "no evidence found for misbehavior %v in height %v",
-				misbehavior, block.Height)
+
+			// Check that evidence was as expected
+			misbehavior, ok := node.Misbehaviors[nodeEvidence.Height()]
+			require.True(t, ok, "found unexpected evidence %v in height %v",
+				nodeEvidence, block.Height)
 
 			switch misbehavior {
 			case "double-prevote":
@@ -45,6 +44,14 @@ func TestEvidence_Misbehavior(t *testing.T) {
 			default:
 				t.Fatalf("unknown misbehavior %v", misbehavior)
 			}
+
+			seenEvidence[nodeEvidence.Height()] = struct{}{}
+		}
+		// see if there is any evidence that we were expecting but didn't see
+		for height, misbehavior := range node.Misbehaviors {
+			_, ok := seenEvidence[height]
+			require.True(t, ok, "expected evidence for %v misbehavior at height %v by node but was never found",
+				misbehavior, height)
 		}
 	})
 }