testing: pass testing.T to assert and require always, assertion cleanup (#7508)

types/block_test.go

@@ -606,7 +606,7 @@ func TestCommitToVoteSetWithVotesForNilBlock(t *testing.T) {
 			commit := voteSet.MakeCommit() // panics without > 2/3 valid votes
 			assert.NotNil(t, commit)
 			err := valSet.VerifyCommit(voteSet.ChainID(), blockID, height-1, commit)
-			assert.Nil(t, err)
+			assert.NoError(t, err)
 		} else {
 			assert.Panics(t, func() { voteSet.MakeCommit() })
 		}

types/node_info_test.go

@@ -241,7 +241,7 @@ func TestParseAddressString(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			addr, port, err := ParseAddressString(tc.addr)
 			if tc.correct {
-				require.Nil(t, err, tc.addr)
+				require.NoError(t, err, tc.addr)
 				assert.Contains(t, tc.expected, addr.String())
 				assert.Contains(t, tc.expected, fmt.Sprint(port))
 			} else {

types/node_key_test.go

@@ -14,10 +14,10 @@ func TestLoadOrGenNodeKey(t *testing.T) {
 	filePath := filepath.Join(t.TempDir(), "peer_id.json")
 
 	nodeKey, err := types.LoadOrGenNodeKey(filePath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	nodeKey2, err := types.LoadOrGenNodeKey(filePath)
-	require.Nil(t, err)
+	require.NoError(t, err)
 	require.Equal(t, nodeKey, nodeKey2)
 }
 

types/part_set_test.go

@@ -48,7 +48,7 @@ func TestBasicPartSet(t *testing.T) {
 	// adding existing part
 	added, err = partSet2.AddPart(partSet2.GetPart(0))
 	assert.False(t, added)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	assert.Equal(t, partSet.Hash(), partSet2.Hash())
 	assert.EqualValues(t, nParts, partSet2.Total())

types/protobuf_test.go

@@ -37,7 +37,7 @@ func TestABCIValidators(t *testing.T) {
 
 	abciVal := TM2PB.ValidatorUpdate(tmVal)
 	tmVals, err := PB2TM.ValidatorUpdates([]abci.ValidatorUpdate{abciVal})
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, tmValExpected, tmVals[0])
 
 	abciVals := TM2PB.ValidatorUpdates(NewValidatorSet(tmVals))
@@ -48,7 +48,7 @@ func TestABCIValidators(t *testing.T) {
 
 	abciVal = TM2PB.ValidatorUpdate(tmVal)
 	tmVals, err = PB2TM.ValidatorUpdates([]abci.ValidatorUpdate{abciVal})
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, tmValExpected, tmVals[0])
 }
 

types/tx_test.go

@@ -92,7 +92,7 @@ func TestValidTxProof(t *testing.T) {
 			require.NoError(t, err)
 
 			p2, err = TxProofFromProto(pb2)
-			if assert.Nil(t, err, "%d: %d: %+v", h, i, err) {
+			if assert.NoError(t, err, "%d: %d: %+v", h, i, err) {
 				assert.Nil(t, p2.Validate(root), "%d: %d", h, i)
 			}
 		}