Replace assert.NoError with require.NoError

celo-org · Jan 8, 2025 · 87e007d · 87e007d
1 parent 15f2f68
commit 87e007d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/core/types/celo_transaction_marshalling_test.go b/core/types/celo_transaction_marshalling_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // TestCeloTransactionMarshalUnmarshal tests that each Celo transactions marshal and unmarshal correctly
@@ -300,10 +301,10 @@ func TestCeloTransactionMarshalUnmarshal(t *testing.T) {
 		t.Helper()
 
 		txJsonOuter, err := json.Marshal(tx)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		txJsonInner, isCeloTx, err := celoTransactionMarshal(tx)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		assert.Equal(t, isCeloTxType, isCeloTx)
 
@@ -324,7 +325,7 @@ func TestCeloTransactionMarshalUnmarshal(t *testing.T) {
 		tx := new(Transaction)
 
 		err := json.Unmarshal([]byte(jsonData), tx)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		// Reassign the signature values because *hexutil.Big decodes "0x0" as nil for the `abs` field.
 		// This causes a mismatch with `big.NewInt(0)`
@@ -347,12 +348,12 @@ func TestCeloTransactionMarshalUnmarshal(t *testing.T) {
 			// Create a copy of the JSON data and remove one of the required fields
 			var jsonMap map[string]interface{}
 			err := json.Unmarshal([]byte(jsonData), &jsonMap)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			delete(jsonMap, field)
 
 			newJsonData, err := json.Marshal(jsonMap)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 
 			// Attempt to unmarshal the JSON data
 			tx := new(Transaction)

diff --git a/core/types/celo_transaction_rlp_test.go b/core/types/celo_transaction_rlp_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 // TestCeloTransactionRLPEncodingDecoding tests the RLP encoding and decoding of Celo transactions
@@ -57,7 +58,7 @@ func TestCeloTransactionRLPEncodingDecoding(t *testing.T) {
 		t.Helper()
 
 		data, err := rlp.EncodeToBytes(value)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		return data
 	}
@@ -264,7 +265,7 @@ func TestCeloTransactionRLPEncodingDecoding(t *testing.T) {
 		var buf bytes.Buffer
 
 		err := tx.EncodeRLP(&buf)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 
 		assert.Equal(t, expectedByte, buf.Bytes())
 	}
@@ -273,8 +274,8 @@ func TestCeloTransactionRLPEncodingDecoding(t *testing.T) {
 		t.Helper()
 
 		data, err := tx.MarshalBinary()
+		require.NoError(t, err)
 
-		assert.NoError(t, err)
 		assert.Equal(t, expectedByte, data)
 	}
 
@@ -283,8 +284,8 @@ func TestCeloTransactionRLPEncodingDecoding(t *testing.T) {
 
 		tx := new(Transaction)
 		err := rlp.DecodeBytes(bytes, tx)
+		require.NoError(t, err)
 
-		assert.NoError(t, err)
 		assert.Equal(t, expectedTx.inner, tx.inner)
 	}
 
@@ -293,8 +294,8 @@ func TestCeloTransactionRLPEncodingDecoding(t *testing.T) {
 
 		tx := new(Transaction)
 		err := tx.UnmarshalBinary(bytes)
+		require.NoError(t, err)
 
-		assert.NoError(t, err)
 		assert.Equal(t, expectedTx.inner, tx.inner)
 	}