update

Author: huangzhen1997

core/capabilities/ccip/ccipevm/executecodec_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
-	agbinary "github.com/gagliardetto/binary"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/ccipsolana"
 	ccipcommon "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common/mocks"
@@ -109,7 +108,7 @@ func TestExecutePluginCodecV1(t *testing.T) {
 		"destgasamount": destGasAmount,
 	}, nil)
 	mockExtraDataCodec.On("DecodeExtraArgs", mock.Anything, mock.Anything).Return(map[string]any{
-		"gasLimit":                agbinary.Uint128{Lo: 5000, Hi: 0},
+		"gasLimit":                utils.RandUint256(),
 		"accountIsWritableBitmap": gasLimit,
 	}, nil)
 

core/capabilities/ccip/ccipevm/msghasher_test.go

@@ -382,18 +382,15 @@ func TestMessagerHasher_againstRmnSharedVector(t *testing.T) {
 			nonce               = uint64(1)
 			// message fields
 			// sender is parsed unpadded since its emitted unpadded from EVM.
-			senderAddress = cciptypes.UnknownAddress(hexutil.MustDecode("0x269895AC2a2eC6e1Df37F68AcfbBDa53e62b71B1"))
+			senderAddress = cciptypes.UnknownAddress(key.PublicKey().Bytes())
 			// onRampAddress is parsed padded because its set as a padded address in the offRamp
 			onRampAddress = key.PublicKey().Bytes()
 			dataField     = "0x"
 			// receiver address is parsed padded because its emitted as padded from EVM.
 			receiverAddress = cciptypes.UnknownAddress(hexutil.MustDecode("0x000000000000000000000000269895ac2a2ec6e1df37f68acfbbda53e62b71b1"))
-			// feeToken is parsed unpadded since its emitted unpadded from EVM.
-			// however, it isn't used in the hash. its just set for completion.
-			feeToken       = common.HexToAddress("0x097D90c9d3E0B50Ca60e1ae45F6A81010f9FB534")
-			feeTokenAmount = big.NewInt(114310554250104)
-			feeValueJuels  = big.NewInt(16499514422603741)
-			tokenAmounts   = []cciptypes.RampTokenAmount{
+			feeTokenAmount  = big.NewInt(114310554250104)
+			feeValueJuels   = big.NewInt(16499514422603741)
+			tokenAmounts    = []cciptypes.RampTokenAmount{
 				{
 					// parsed unpadded since its emitted unpadded from SVM.
 					SourcePoolAddress: cciptypes.UnknownAddress(key.PublicKey().Bytes()),
@@ -421,7 +418,7 @@ func TestMessagerHasher_againstRmnSharedVector(t *testing.T) {
 				Data:           hexutil.MustDecode(dataField),
 				Receiver:       receiverAddress,
 				ExtraArgs:      append(evmExtraArgsV2Tag, extraArgsbuf.Bytes()...),
-				FeeToken:       feeToken.Bytes(),
+				FeeToken:       key.PublicKey().Bytes(),
 				FeeTokenAmount: cciptypes.NewBigInt(feeTokenAmount),
 				FeeValueJuels:  cciptypes.NewBigInt(feeValueJuels),
 				TokenAmounts:   tokenAmounts,