Merge branch 'v0.35.x' into sam/abci-responses

test/e2e/generator/generate.go

@@ -47,8 +47,6 @@ var (
 		"tcp":  20,
 		"unix": 10,
 	}
-	// FIXME: v2 disabled due to flake
-	nodeBlockSyncs = uniformChoice{"v0"} // "v2"
 	nodeMempools   = uniformChoice{"v0", "v1"}
 	nodeStateSyncs = weightedChoice{
 		e2e.StateSyncDisabled: 10,
@@ -397,7 +395,7 @@ func generateNode(
 		StartAt:          startAt,
 		Database:         nodeDatabases.Choose(r),
 		PrivvalProtocol:  nodePrivvalProtocols.Choose(r),
-		BlockSync:        nodeBlockSyncs.Choose(r).(string),
+		BlockSync:        "v0",
 		Mempool:          nodeMempools.Choose(r).(string),
 		StateSync:        e2e.StateSyncDisabled,
 		PersistInterval:  ptrUint64(uint64(nodePersistIntervals.Choose(r).(int))),

test/e2e/networks/ci.toml

@@ -43,7 +43,6 @@ persist_interval = 0
 perturb = ["restart"]
 privval_protocol = "tcp"
 seeds = ["seed01"]
-block_sync = "v0"
 
 [node.validator03]
 database = "badgerdb"
@@ -52,7 +51,6 @@ abci_protocol = "grpc"
 persist_interval = 3
 perturb = ["kill"]
 privval_protocol = "grpc"
-block_sync = "v0"
 retain_blocks = 10
 
 [node.validator04]
@@ -61,11 +59,9 @@ snapshot_interval = 5
 database = "rocksdb"
 persistent_peers = ["validator01"]
 perturb = ["pause"]
-block_sync = "v0"
 
 [node.validator05]
 database = "cleveldb"
-block_sync = "v0"
 state_sync = "p2p"
 seeds = ["seed01"]
 start_at = 1005 # Becomes part of the validator set at 1010
@@ -76,7 +72,6 @@ privval_protocol = "tcp"
 [node.full01]
 mode = "full"
 start_at = 1010
-block_sync = "v0"
 persistent_peers = ["validator01", "validator02", "validator03", "validator04"]
 perturb = ["restart"]
 retain_blocks = 10

test/e2e/pkg/testnet.go

@@ -178,7 +178,7 @@ func LoadTestnet(file string) (*Testnet, error) {
 			ABCIProtocol:     Protocol(testnet.ABCIProtocol),
 			PrivvalProtocol:  ProtocolFile,
 			StartAt:          nodeManifest.StartAt,
-			BlockSync:        nodeManifest.BlockSync,
+			BlockSync:        "v0",
 			Mempool:          nodeManifest.Mempool,
 			StateSync:        nodeManifest.StateSync,
 			PersistInterval:  1,

test/e2e/runner/rpc.go

@@ -22,7 +22,7 @@ func waitForHeight(ctx context.Context, testnet *e2e.Testnet, height int64) (*ty
 		clients         = map[string]*rpchttp.HTTP{}
 		lastHeight      int64
 		lastIncrease    = time.Now()
-		nodesAtHeight   = map[string]struct{}{}
+		nodesAtHeight   = map[string]int64{}
 		numRunningNodes int
 	)
 	if height == 0 {
@@ -86,7 +86,7 @@ func waitForHeight(ctx context.Context, testnet *e2e.Testnet, height int64) (*ty
 
 					// add this node to the set of target
 					// height nodes
-					nodesAtHeight[node.Name] = struct{}{}
+					nodesAtHeight[node.Name] = result.SyncInfo.LatestBlockHeight
 
 					// if not all of the nodes that we
 					// have clients for have reached the
@@ -111,7 +111,7 @@ func waitForHeight(ctx context.Context, testnet *e2e.Testnet, height int64) (*ty
 			if len(clients) == 0 {
 				return nil, nil, errors.New("unable to connect to any network nodes")
 			}
-			if time.Since(lastIncrease) >= time.Minute {
+			if time.Since(lastIncrease) >= 90*time.Second {
 				if lastHeight == 0 {
 					return nil, nil, errors.New("chain stalled at unknown height (most likely upon starting)")
 				}

test/e2e/tests/net_test.go

@@ -17,6 +17,8 @@ func TestNet_Peers(t *testing.T) {
 		netInfo, err := client.NetInfo(ctx)
 		require.NoError(t, err)
 
+		// FIXME: https://github.com/tendermint/tendermint/issues/8848
+		// We should be able to assert that we can discover all peers in a network
 		expectedPeers := len(node.Testnet.Nodes)
 		peers := make(map[string]*e2e.Node, 0)
 		seen := map[string]bool{}
@@ -30,7 +32,7 @@ func TestNet_Peers(t *testing.T) {
 			seen[n.Name] = false
 		}
 
-		require.Equal(t, expectedPeers, netInfo.NPeers,
+		require.GreaterOrEqual(t, netInfo.NPeers, expectedPeers-1,
 			"node is not fully meshed with peers")
 
 		for _, peerInfo := range netInfo.Peers {
@@ -42,8 +44,10 @@ func TestNet_Peers(t *testing.T) {
 			seen[peer.Name] = true
 		}
 
-		for name := range seen {
-			require.True(t, seen[name], "node %v not peered with %v", node.Name, name)
-		}
+		// FIXME: https://github.com/tendermint/tendermint/issues/8848
+		// We should be able to assert that we can discover all peers in a network
+		// for name := range seen {
+		// 	require.True(t, seen[name], "node %v not peered with %v", node.Name, name)
+		// }
 	})
 }