Upgrade crust and GolangCI v2 support

Author: TxCorpi0x

integration-tests/contract/sending_test.go

@@ -2942,7 +2942,7 @@ func TestFeeCalculations_MultipleAssetsAndPartialClaim(t *testing.T) {
 			for _, asset := range assets {
 				if asset.registeredToken.CoreumDenom == fee.Denom {
 					found = true
-					assert.EqualValues(t, fee.Amount.String(), asset.bridgingFee.Quo(sdkmath.NewInt(int64(len(relayers)))).String())
+					assert.Equal(t, fee.Amount.String(), asset.bridgingFee.Quo(sdkmath.NewInt(int64(len(relayers)))).String())
 					break
 				}
 			}
@@ -2972,7 +2972,7 @@ func TestFeeCalculations_MultipleAssetsAndPartialClaim(t *testing.T) {
 		remainderFees := initialFees.Sub(oneThirdOfFees...)
 		fees, err := contractClient.GetFeesCollected(ctx, relayer.CoreumAddress)
 		require.NoError(t, err)
-		require.EqualValues(t, remainderFees.String(), fees.String())
+		require.Equal(t, remainderFees.String(), fees.String())
 
 		// claim remainder of fees
 		_, err = contractClient.ClaimRelayerFees(ctx, relayer.CoreumAddress, remainderFees)
@@ -3399,7 +3399,7 @@ func claimFeesAndMakeAssertions(
 		require.NoError(t, err)
 		balanceChange := relayerBalanceAfterClaim.Balance.
 			Sub(*relayerBalanceBeforeClaim.Balance)
-		require.EqualValues(t, expectedFeeAmount.String(), balanceChange.Amount.String())
+		require.Equal(t, expectedFeeAmount.String(), balanceChange.Amount.String())
 
 		// assert fees are now collected
 		fees, err = contractClient.GetFeesCollected(ctx, relayer.CoreumAddress)
@@ -3408,7 +3408,7 @@ func claimFeesAndMakeAssertions(
 			require.Empty(t, fees, 0)
 		} else {
 			expectedRemainder := remainderAmount.QuoRaw(int64(len(relayers)))
-			require.EqualValues(t, fees[0].Amount.String(), expectedRemainder.String())
+			require.Equal(t, fees[0].Amount.String(), expectedRemainder.String())
 		}
 	}
 }

integration-tests/contract/token_registry_test.go

@@ -851,7 +851,7 @@ func TestEnableAndDisableXRPLOriginatedToken(t *testing.T) {
 	pendingRefunds, err := contractClient.GetPendingRefunds(ctx, coreumRecipient)
 	require.NoError(t, err)
 	require.Len(t, pendingRefunds, 1)
-	require.EqualValues(t, pendingRefunds[0].Coin.String(), coinToSendBack.String())
+	require.Equal(t, pendingRefunds[0].Coin.String(), coinToSendBack.String())
 	_, err = contractClient.ClaimRefund(ctx, coreumRecipient, pendingRefunds[0].ID)
 	require.NoError(t, err)
 
@@ -1075,7 +1075,7 @@ func TestEnableAndDisableCoreumOriginatedToken(t *testing.T) {
 	pendingRefunds, err := contractClient.GetPendingRefunds(ctx, coreumSenderAddress)
 	require.NoError(t, err)
 	require.Len(t, pendingRefunds, 1)
-	require.EqualValues(t, pendingRefunds[0].Coin.String(), coinToSendFromCoreumToXRPL.String())
+	require.Equal(t, pendingRefunds[0].Coin.String(), coinToSendFromCoreumToXRPL.String())
 	_, err = contractClient.ClaimRefund(ctx, coreumSenderAddress, pendingRefunds[0].ID)
 	require.NoError(t, err)
 

integration-tests/init.go

@@ -61,7 +61,7 @@ func init() {
 	if err != nil {
 		panic(errors.Wrapf(err, "failed to init coreum chain"))
 	}
-	coreumChain.Chain.ClientContext = coreumChain.Chain.ClientContext.WithCodec(coreumChain.Chain.EncodingConfig.Codec)
+	coreumChain.ClientContext = coreumChain.ClientContext.WithCodec(coreumChain.EncodingConfig.Codec)
 	chains.Coreum = coreumChain
 
 	xrplChain, err := NewXRPLChain(xrplCfg, chains.Log)

integration-tests/processes/sending_test.go

@@ -145,7 +145,7 @@ func TestSendXRPLOriginatedTokensFromXRPLToCoreumAndBack(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, fees, 1)
 		expectedFees := bridgingFee.MulRaw(5).QuoRaw(int64(envCfg.RelayersCount))
-		require.EqualValues(t, expectedFees.String(), fees.AmountOf(registeredXRPLToken.CoreumDenom).String())
+		require.Equal(t, expectedFees.String(), fees.AmountOf(registeredXRPLToken.CoreumDenom).String())
 	}
 }
 

integration-tests/processes/tickets_allocation_test.go

@@ -227,7 +227,7 @@ func TestTicketsReAllocationByTheXRPLTokenRegistration(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, availableTicketsAfterReallocation, int(envCfg.UsedTicketSequenceThreshold))
 	// check that tickets are used
-	require.NotEqualValues(t, initialAvailableTickets, availableTicketsAfterReallocation)
+	require.NotEqual(t, initialAvailableTickets, availableTicketsAfterReallocation)
 
 	// use re-allocated tickets
 	for range numberOfXRPLTokensToRegister {
@@ -245,8 +245,8 @@ func TestTicketsReAllocationByTheXRPLTokenRegistration(t *testing.T) {
 	runnerEnv.AwaitNoPendingOperations(ctx, t)
 	availableTicketsAfterSecondReallocation, err := runnerEnv.ContractClient.GetAvailableTickets(ctx)
 	require.NoError(t, err)
-	require.NotEqualValues(t, initialAvailableTickets, availableTicketsAfterSecondReallocation)
-	require.NotEqualValues(t, availableTicketsAfterReallocation, availableTicketsAfterSecondReallocation)
+	require.NotEqual(t, initialAvailableTickets, availableTicketsAfterSecondReallocation)
+	require.NotEqual(t, availableTicketsAfterReallocation, availableTicketsAfterSecondReallocation)
 }
 
 func TestSendXRPLOriginatedTokenFromXRPLToCoreumWithTicketsReallocation(t *testing.T) {

integration-tests/stress/env_test.go

@@ -78,7 +78,7 @@ func NewEnv(t *testing.T, cfg EnvConfig) *Env {
 	)
 
 	// import contract owner mnemonic
-	contractOwner := chains.Coreum.ChainContext.ImportMnemonic(bridgeCfg.OwnerMnemonic)
+	contractOwner := chains.Coreum.ImportMnemonic(bridgeCfg.OwnerMnemonic)
 
 	return &Env{
 		Cfg:            cfg,

integration-tests/xrpl/rpc_test.go

@@ -250,7 +250,7 @@ func TestCreateAndUseTicketForPaymentAndTicketsCreation(t *testing.T) {
 	}
 	chains.XRPL.AutoFillTx(ctx, t, &createTicketsTx, senderAcc)
 	// reset sequence and add ticket
-	createTicketsTx.TxBase.Sequence = 0
+	createTicketsTx.Sequence = 0
 	createTicketsTx.TicketSequence = createdTickets[0].TicketSequence
 	require.NoError(t, chains.XRPL.SignAndSubmitTx(ctx, t, &createTicketsTx, senderAcc))
 
@@ -272,7 +272,7 @@ func TestCreateAndUseTicketForPaymentAndTicketsCreation(t *testing.T) {
 	}
 	chains.XRPL.AutoFillTx(ctx, t, &xrpPaymentTx, senderAcc)
 	// reset sequence and add ticket
-	xrpPaymentTx.TxBase.Sequence = 0
+	xrpPaymentTx.Sequence = 0
 	xrpPaymentTx.TicketSequence = createdTickets[0].TicketSequence
 
 	t.Logf("Recipient account balance before: %s", chains.XRPL.GetAccountBalances(ctx, t, recipientAcc))
@@ -300,7 +300,7 @@ func TestCreateAndUseTicketForPaymentAndTicketsCreation(t *testing.T) {
 	}
 	chains.XRPL.AutoFillTx(ctx, t, &fooPaymentTx, senderAcc)
 	// reset sequence and add ticket
-	fooPaymentTx.TxBase.Sequence = 0
+	fooPaymentTx.Sequence = 0
 	fooPaymentTx.TicketSequence = ticketForFailingTx
 	// there is no trust set so the tx should fail and use the ticket
 	require.ErrorContains(
@@ -319,7 +319,7 @@ func TestCreateAndUseTicketForPaymentAndTicketsCreation(t *testing.T) {
 	}
 	chains.XRPL.AutoFillTx(ctx, t, &xrpPaymentTx, senderAcc)
 	// reset sequence and add ticket
-	xrpPaymentTx.TxBase.Sequence = 0
+	xrpPaymentTx.Sequence = 0
 	xrpPaymentTx.TicketSequence = ticketForFailingTx
 	// the ticket is used in prev failed transaction so can't be used here
 	require.ErrorContains(t, chains.XRPL.SignAndSubmitTx(ctx, t, &fooPaymentTx, senderAcc), "Ticket is not in ledger")
@@ -1031,7 +1031,7 @@ func TestXRPLClawback(t *testing.T) {
 	require.NoError(t, chains.XRPL.AutoFillSignAndSubmitTx(ctx, t, &clawbackTx, issuerClawbackAcc))
 	balancesAfter = chains.XRPL.GetAccountBalances(ctx, t, recipientAcc)
 	t.Logf("Recipient account balances after: %s", balancesAfter)
-	require.True(t, balancesAfter[currencyIssuerClawbackKey].Value.IsZero())
+	require.True(t, balancesAfter[currencyIssuerClawbackKey].IsZero())
 
 	// try to do the clawback after the issuance
 	fooNoClawbackCurrencyTrustSetTx := rippledata.TrustSet{
@@ -1116,7 +1116,7 @@ func buildXrpPaymentTxForMultiSigning(
 	}
 	xrplChain.AutoFillTx(ctx, t, &tx, from)
 	// important for the multi-signing
-	tx.TxBase.SigningPubKey = &rippledata.PublicKey{}
+	tx.SigningPubKey = &rippledata.PublicKey{}
 
 	return tx
 }
@@ -1148,7 +1148,7 @@ func buildCreateTicketsTxForMultiSigning(
 		tx.TicketSequence = ticketSeq
 	}
 	// important for the multi-signing
-	tx.TxBase.SigningPubKey = &rippledata.PublicKey{}
+	tx.SigningPubKey = &rippledata.PublicKey{}
 
 	return tx
 }
@@ -1179,7 +1179,7 @@ func buildUpdateSignerListSetTxForMultiSigning(
 	}
 	xrplChain.AutoFillTx(ctx, t, &tx, from)
 	// important for the multi-signing
-	tx.TxBase.SigningPubKey = &rippledata.PublicKey{}
+	tx.SigningPubKey = &rippledata.PublicKey{}
 
 	if ticketSeq != nil {
 		tx.Sequence = 0