fix(tests): tests token + lint fix

Author: rodrigombsoares

ccip/devenv/impl.go

@@ -223,9 +223,11 @@ type Chain struct {
 	validatorAPIClients validatorAPIClients
 
 	feeTokenInstrument      splice_api_token_holding_v1.InstrumentId
+	feeAmountPerMessage     uint64 // per-message fee budget; used when rotating fee holdings after send
 	nextFeeCID              string // holding CID to be used as fee on next message send
 	transferTokenInstrument *splice_api_token_holding_v1.InstrumentId
 	nextTransferCID         string // holding CID to be used as transfer on next message send
+	sendsLeft               uint64 // remaining sends in current setup batch; 0 = always rotate
 
 	// verifierObs is injected post-construction by test runners (see SetVerifierObservation).
 	// Required by ConfirmExecOnDest to fetch verifier results from aggregator/indexer.
@@ -1072,9 +1074,12 @@ func (c *Chain) SetupSend(
 	}
 
 	c.feeTokenInstrument = feeTokenInstrument
+	c.feeAmountPerMessage = feeAmountPerMessage
 	c.nextFeeCID = selectedFee[0].ContractID
 
 	if transferAmountPerMessage == nil || transferAmountPerMessage.Sign() <= 0 {
+		c.transferTokenInstrument = nil
+		c.nextTransferCID = ""
 		return nil
 	}
 
@@ -1103,6 +1108,17 @@ func (c *Chain) SetupSend(
 	return nil
 }
 
+// SetSequentialSends limits holding rotation to the next sends messages in this setup batch.
+// After the send whose on-chain seq equals nextSeq+sends, setNextHoldings is skipped.
+// Pass 0 to always rotate (open-ended load).
+func (c *Chain) SetSequentialSends(sends int) {
+	if sends <= 0 {
+		c.sendsLeft = 0
+		return
+	}
+	c.sendsLeft = uint64(sends)
+}
+
 // MintTokens mint tokens for transfer and fees. To be used on devenv tests only.
 // this method won't work in staging/prod tests
 func (c *Chain) MintTokens(ctx context.Context, amount *big.Rat) error {
@@ -1440,16 +1456,6 @@ func (c *Chain) SendMessage(ctx context.Context, dest uint64, fields cciptestint
 		Uint64("seqNo", parsedSend.seqNo).
 		Msg("CCIP Send executed")
 
-	// Set next holdings
-	var tokenAmount *big.Rat
-	if hasTokenTransfer {
-		tokenAmount = new(big.Rat).SetFrac(fields.TokenAmount.Amount, big.NewInt(CantonFixedPointScale))
-	}
-	err = c.setNextHoldings(update.GetTransaction().GetEvents(), hasTokenTransfer, tokenAmount)
-	if err != nil {
-		return cciptestinterfaces.MessageSentEvent{}, fmt.Errorf("set next holdings: %w", err)
-	}
-
 	event := cciptestinterfaces.MessageSentEvent{
 		MessageID:      parsedSend.messageID,
 		ReceiptIssuers: nil, // TODO: add them later, not currently needed
@@ -1462,6 +1468,24 @@ func (c *Chain) SendMessage(ctx context.Context, dest uint64, fields cciptestint
 	c.lastSentSeq = parsedSend.seqNo
 	c.lastSentEvent = event
 
+	c.sendsLeft--
+	if c.sendsLeft == 0 {
+		c.logger.Info().
+			Uint64("sendsLeft", c.sendsLeft).
+			Msg("Skipping holding rotation after last planned send in batch")
+
+		return event, nil
+	}
+
+	var tokenAmount *big.Rat
+	if hasTokenTransfer {
+		tokenAmount = new(big.Rat).SetFrac(fields.TokenAmount.Amount, big.NewInt(CantonFixedPointScale))
+	}
+	err = c.setNextHoldings(update.GetTransaction().GetEvents(), hasTokenTransfer, tokenAmount)
+	if err != nil {
+		return cciptestinterfaces.MessageSentEvent{}, fmt.Errorf("set next holdings: %w", err)
+	}
+
 	return event, nil
 }
 
@@ -1590,10 +1614,11 @@ func (c *Chain) setNextHoldings(events []*apiv2.Event, hasTokenTransfer bool, to
 		testhelpers.ExcludeCIDs(spentCIDs),
 	}
 
+	feeMin := new(big.Rat).SetUint64(c.feeAmountPerMessage)
 	nextFeeCID, exhaustion, err := pickNextHolding(
 		events,
 		c.feeTokenInstrument,
-		big.NewRat(0, 1), // TODO: we'll have to consider real fee here once we go load tests
+		feeMin,
 		refreshFilters...,
 	)
 	if err != nil && !exhaustion {

ccip/devenv/tests/e2e/canton2evm_e2e_test.go

@@ -161,6 +161,7 @@ func TestCanton2EVM_Basic(t *testing.T) {
 		} else {
 			require.NoError(t, cantonImpl.SetupSend(ctx, fee, transferPerSend))
 		}
+		cantonImpl.SetSequentialSends(sends)
 
 		ds, err := lib.DataStore()
 		require.NoError(t, err)
@@ -255,6 +256,7 @@ func TestCanton2EVM_Basic(t *testing.T) {
 		} else {
 			require.NoError(t, cantonImpl.SetupSend(ctx, fee, transferPerSend))
 		}
+		cantonImpl.SetSequentialSends(1)
 
 		receiver, err := evmChain.GetEOAReceiverAddress()
 		require.NoError(t, err)
@@ -306,6 +308,7 @@ func TestCanton2EVM_Basic(t *testing.T) {
 		} else {
 			require.NoError(t, cantonImpl.SetupSend(ctx, fee, transferPerSend))
 		}
+		cantonImpl.SetSequentialSends(1)
 
 		ds, err := lib.DataStore()
 		require.NoError(t, err)

ccip/devenv/tests/load/load_helpers.go

@@ -267,7 +267,7 @@ func setupCantonTokenLoadHoldings(
 	estimated := estimateMessages(sched)
 	fee := uint64(cantondevenv.CantonToEVMTokenTransferFeeAmount)
 	feeTotal := new(big.Rat).SetUint64(estimated * fee)
-	transferTotalFP := new(big.Int).Mul(lane.TransferAmount, big.NewInt(int64(estimated)))
+	transferTotalFP := new(big.Int).Mul(lane.TransferAmount, new(big.Int).SetUint64(estimated))
 	transferTotal := new(big.Rat).SetFrac(transferTotalFP, big.NewInt(cantondevenv.CantonFixedPointScale))
 	transferPerSend := new(big.Rat).SetFrac(lane.TransferAmount, big.NewInt(cantondevenv.CantonFixedPointScale))
 	t.Logf("Pre-mint: estimatedMessages=%d feeTotal=%s transferTotal=%s",
@@ -279,6 +279,7 @@ func setupCantonTokenLoadHoldings(
 	} else {
 		require.NoError(t, cantonImpl.SetupSend(ctx, fee, transferPerSend))
 	}
+	cantonImpl.SetSequentialSends(int(estimated))
 }
 
 func evmLoadDestination(chain cciptestinterfaces.CCIP17, receiver protocol.UnknownAddress) Destination {

ccip/devenv/tests/token_lane_test.go

@@ -127,7 +127,7 @@ func TestNormalizeTransferInstrumentID(t *testing.T) {
 	require.Equal(t, "link-token", normalizeTransferInstrumentID("LINK"))
 	require.Equal(t, "link-token", normalizeTransferInstrumentID("link"))
 	require.Equal(t, "link-token", normalizeTransferInstrumentID(" link "))
-	require.Equal(t, "amulet", normalizeTransferInstrumentID("Amulet"))
+	require.Equal(t, "Amulet", normalizeTransferInstrumentID("Amulet"))
 	require.Equal(t, "link-token", normalizeTransferInstrumentID("link-token"))
 }
 

deployment/sequences/token_pools.go

@@ -592,12 +592,12 @@ var DeployTokenPoolForToken = operations.NewSequence(
 			return ccipsequences.OnChainOutput{}, fmt.Errorf("tokenRef.address is required")
 		}
 		tokenRef := datastore.AddressRef{
-			Address: tokenAddress,
-			Type:    datastore.ContractType("Token"),
-			// TODO: what should this be set to?
+			Address:       tokenAddress,
+			Type:          datastore.ContractType("Token"),
 			Version:       input.TokenPoolVersion,
 			Qualifier:     qualifier,
 			ChainSelector: input.ChainSelector,
+			Labels:        input.TokenRef.Labels,
 		}
 
 		if mcmsEnabled && len(proposalOutputs) > 0 {