Removed experimental maps package (#1257)

amit-momin · web-flow · commit 1cb7f8e7185b · 2025-10-15T14:37:47.000Z
diff --git a/cmd/carpenter/go.mod b/cmd/carpenter/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250422094245-d734371d67f2
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v3 v3.0.0-beta1
-	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
 	golang.org/x/term v0.31.0
 )
 
@@ -48,6 +47,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
 	golang.org/x/sync v0.13.0 // indirect
 	golang.org/x/sys v0.32.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
diff --git a/cmd/carpenter/internal/format/summary/summary.go b/cmd/carpenter/internal/format/summary/summary.go
@@ -3,9 +3,8 @@ package summary
 
 import (
 	"fmt"
-	"sort"
-
-	"golang.org/x/exp/maps"
+	"maps"
+	"slices"
 
 	"github.com/smartcontractkit/chainlink-ccip/cmd/carpenter/internal/format"
 	"github.com/smartcontractkit/chainlink-ccip/cmd/carpenter/internal/parse"
@@ -54,24 +53,20 @@ func (sr summaryFormatter) Format(data *parse.Data) {
 }
 
 func (sr summaryFormatter) Close() error {
-	dons := maps.Keys(sr.commits)
-	sort.Ints(dons)
+	dons := slices.Sorted(maps.Keys(sr.commits))
 	for _, donID := range dons {
 		fmt.Println("Commit Summary for DON", donID)
-		keys := maps.Keys(sr.commits[donID])
-		sort.Ints(keys)
+		keys := slices.Sorted(maps.Keys(sr.commits[donID]))
 		for _, key := range keys {
 			fmt.Println(sr.commits[donID][key].String())
 		}
 		fmt.Println()
 	}
 
-	dons = maps.Keys(sr.execs)
-	sort.Ints(dons)
+	dons = slices.Sorted(maps.Keys(sr.execs))
 	for _, donID := range dons {
 		fmt.Println("Commit logs for DON", donID)
-		keys := maps.Keys(sr.execs[donID])
-		sort.Ints(keys)
+		keys := slices.Sorted(maps.Keys(sr.execs[donID]))
 		for _, key := range keys {
 			fmt.Println(sr.execs[donID][key].String())
 		}
diff --git a/commit/chainfee/observation.go b/commit/chainfee/observation.go
@@ -2,11 +2,12 @@ package chainfee
 
 import (
 	"context"
+	"maps"
 	"math/big"
+	"slices"
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
-	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
@@ -62,13 +63,13 @@ func (p *processor) Observation(
 	asynclib.WaitForAllNoErrOperations(ctx, p.cfg.ChainFeeAsyncObserverSyncTimeout, operations, lggr)
 	now := time.Now().UTC()
 
-	chainsWithNativeTokenPrices := mapset.NewSet(maps.Keys(feeComponents)...).
+	chainsWithNativeTokenPrices := mapset.NewSet(slices.Collect(maps.Keys(feeComponents))...).
 		Intersect(
-			mapset.NewSet(maps.Keys(nativeTokenPrices)...),
+			mapset.NewSet(slices.Collect(maps.Keys(nativeTokenPrices))...),
 		)
-	chainsWithoutNativeTokenPrices := mapset.NewSet(maps.Keys(feeComponents)...).
+	chainsWithoutNativeTokenPrices := mapset.NewSet(slices.Collect(maps.Keys(feeComponents))...).
 		Difference(
-			mapset.NewSet(maps.Keys(nativeTokenPrices)...),
+			mapset.NewSet(slices.Collect(maps.Keys(nativeTokenPrices))...),
 		)
 
 	lggr.Infow("observed fee components",
diff --git a/commit/chainfee/observation_test.go b/commit/chainfee/observation_test.go
@@ -1,14 +1,15 @@
 package chainfee
 
 import (
+	"maps"
 	"math/big"
 	"math/rand"
+	"slices"
 	"sort"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/mock"
-	"golang.org/x/exp/maps"
 
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/stretchr/testify/require"
@@ -187,11 +188,11 @@ func Test_processor_Observation(t *testing.T) {
 			require.GreaterOrEqual(t, obs.TimestampNow.UnixNano(), tStart.UnixNano())
 			require.LessOrEqual(t, obs.TimestampNow.UnixNano(), tEnd.UnixNano())
 			require.Equal(t, tc.chainFeeComponents, obs.FeeComponents)
-			require.ElementsMatch(t, slicesWithoutDst, maps.Keys(obs.FeeComponents))
+			require.ElementsMatch(t, slicesWithoutDst, slices.Collect(maps.Keys(obs.FeeComponents)))
 			require.Equal(t, tc.nativeTokenPrices, obs.NativeTokenPrices)
-			require.ElementsMatch(t, slicesWithoutDst, maps.Keys(obs.NativeTokenPrices))
+			require.ElementsMatch(t, slicesWithoutDst, slices.Collect(maps.Keys(obs.NativeTokenPrices)))
 			require.Equal(t, tc.expectedChainFeePriceUpdates, obs.ChainFeeUpdates)
-			require.ElementsMatch(t, slicesWithoutDst, maps.Keys(obs.ChainFeeUpdates))
+			require.ElementsMatch(t, slicesWithoutDst, slices.Collect(maps.Keys(obs.ChainFeeUpdates)))
 			require.Equal(t, tc.fChain, obs.FChain)
 		})
 	}
@@ -385,9 +386,12 @@ func Test_unique_chain_filter_in_Observation(t *testing.T) {
 				return
 			}
 
-			require.True(t, tc.expUniqueChains == len(maps.Keys(obs.FeeComponents)))
-			require.True(t, tc.expUniqueChains == len(maps.Keys(obs.NativeTokenPrices)))
-			require.ElementsMatch(t, maps.Keys(obs.FeeComponents), maps.Keys(obs.NativeTokenPrices))
+			require.True(t, tc.expUniqueChains == len(obs.FeeComponents))
+			require.True(t, tc.expUniqueChains == len(obs.NativeTokenPrices))
+			require.ElementsMatch(t,
+				slices.Collect(maps.Keys(obs.FeeComponents)),
+				slices.Collect(maps.Keys(obs.NativeTokenPrices)),
+			)
 		})
 	}
 }
diff --git a/commit/chainfee/validate_observation.go b/commit/chainfee/validate_observation.go
@@ -2,16 +2,16 @@ package chainfee
 
 import (
 	"fmt"
+	"maps"
 	"math/big"
+	"slices"
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 
 	"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon"
-
-	"golang.org/x/exp/maps"
 )
 
 func (p *processor) ValidateObservation(
@@ -112,7 +112,10 @@ func validateObservedChains(
 		return fmt.Errorf("fee components and native token prices have different observed chains")
 	}
 
-	observedChains := append(maps.Keys(obs.FeeComponents), maps.Keys(obs.NativeTokenPrices)...)
+	observedChains := append(
+		slices.Collect(maps.Keys(obs.FeeComponents)),
+		slices.Collect(maps.Keys(obs.NativeTokenPrices))...,
+	)
 	if len(obs.ChainFeeUpdates) > 0 {
 		// chainFeeUpdates are read from the destination chain, if the oracle observed any chain fee updates
 		// it should support the destination chain.
diff --git a/commit/merkleroot/observation_test.go b/commit/merkleroot/observation_test.go
@@ -6,13 +6,13 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"maps"
 	"testing"
 
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
 	types2 "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
diff --git a/commit/merkleroot/outcome.go b/commit/merkleroot/outcome.go
@@ -3,11 +3,11 @@ package merkleroot
 import (
 	"context"
 	"fmt"
+	"maps"
+	"slices"
 	"sort"
 	"time"
 
-	"golang.org/x/exp/maps"
-
 	mapset "github.com/deckarep/golang-set/v2"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -189,7 +189,7 @@ func buildMerkleRootsOutcome(
 	prevOutcome Outcome,
 	addressCodec cciptypes.AddressCodec,
 ) (Outcome, error) {
-	roots := maps.Values(consensusObservation.MerkleRoots)
+	roots := slices.Collect(maps.Values(consensusObservation.MerkleRoots))
 
 	outcomeType := ReportGenerated
 	if len(roots) == 0 {
diff --git a/commit/merkleroot/rmn/controller.go b/commit/merkleroot/rmn/controller.go
@@ -10,13 +10,13 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"maps"
 	"math/rand"
 	"slices"
 	"sort"
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
-	"golang.org/x/exp/maps"
 	"google.golang.org/protobuf/proto"
 
 	typconv "github.com/smartcontractkit/chainlink-ccip/internal/libs/typeconv"
@@ -585,7 +585,7 @@ func chainsWithSufficientObservationResponses(
 			continue
 		}
 
-		mostVotedRootVotes := slices.Max(maps.Values(countsPerRoot))
+		mostVotedRootVotes := slices.Max(slices.Collect(maps.Values(countsPerRoot)))
 		if consensus.LtFPlusOne(fObserve, mostVotedRootVotes) {
 			lggr.Infow("chain skipped, maximally voted root doesn't have enough votes",
 				"chain", sourceChain,
diff --git a/commit/report.go b/commit/report.go
@@ -6,13 +6,13 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"maps"
+	"slices"
 	"sort"
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
 
@@ -87,7 +87,7 @@ func (p *Plugin) Reports(
 
 	transmissionSchedule, err := plugincommon.GetTransmissionSchedule(
 		p.chainSupport,
-		maps.Keys(p.oracleIDToP2PID),
+		slices.Collect(maps.Keys(p.oracleIDToP2PID)),
 		p.offchainCfg.TransmissionDelayMultiplier,
 	)
 	if err != nil {
diff --git a/commit/tokenprice/observation.go b/commit/tokenprice/observation.go
@@ -2,12 +2,11 @@ package tokenprice
 
 import (
 	"context"
-	"sort"
+	"maps"
+	"slices"
 	"sync"
 	"time"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/libocr/commontypes"
 
@@ -128,7 +127,7 @@ func (b *baseObserver) observeFeedTokenPrices(ctx context.Context, lggr logger.L
 		return cciptypes.TokenPriceMap{}
 	}
 
-	tokensToQuery := maps.Keys(b.offChainCfg.TokenInfo)
+	tokensToQuery := slices.Collect(maps.Keys(b.offChainCfg.TokenInfo))
 	lggr.Infow("observing feed token prices", "tokens", tokensToQuery)
 	tokenPrices, err := b.tokenPriceReader.GetFeedPricesUSD(ctx, tokensToQuery)
 	if err != nil {
@@ -158,9 +157,8 @@ func (b *baseObserver) observeFeeQuoterTokenUpdates(
 		return map[cciptypes.UnknownEncodedAddress]cciptypes.TimestampedBig{}
 	}
 
-	tokensToQuery := maps.Keys(b.offChainCfg.TokenInfo)
 	// sort tokens to query to ensure deterministic order
-	sort.Slice(tokensToQuery, func(i, j int) bool { return tokensToQuery[i] < tokensToQuery[j] })
+	tokensToQuery := slices.Sorted(maps.Keys(b.offChainCfg.TokenInfo))
 	lggr.Infow("observing fee quoter token updates")
 	priceUpdates, err := b.tokenPriceReader.GetFeeQuoterTokenUpdates(ctx, tokensToQuery, b.destChain)
 	if err != nil {
diff --git a/execute/exectypes/observation.go b/execute/exectypes/observation.go
@@ -2,8 +2,7 @@ package exectypes
 
 import (
 	"context"
-
-	"golang.org/x/exp/maps"
+	"maps"
 
 	cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
 
diff --git a/execute/metrics/prom.go b/execute/metrics/prom.go
@@ -3,13 +3,14 @@ package metrics
 import (
 	"context"
 	"fmt"
+	"maps"
+	"slices"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -187,7 +188,7 @@ func (p *PromReporter) TrackObservation(obs exectypes.Observation, state exectyp
 	p.trackOutputStats(obs, state, plugincommon.ObservationMethod)
 
 	for sourceChainSelector, cr := range obs.Messages {
-		maxSeqNr := pickHighestSeqNr(maps.Keys(cr))
+		maxSeqNr := pickHighestSeqNr(slices.Collect(maps.Keys(cr)))
 		p.trackMaxSequenceNumber(sourceChainSelector, maxSeqNr, plugincommon.ObservationMethod)
 		p.trackLatestRoundID(round, sourceChainSelector, plugincommon.OutcomeMethod)
 	}
diff --git a/execute/plugin.go b/execute/plugin.go
@@ -6,12 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"slices"
 	"sort"
 	"time"
 
 	mapset "github.com/deckarep/golang-set/v2"
-	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/libocr/commontypes"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
@@ -608,7 +608,7 @@ func (p *Plugin) Reports(
 
 	transmissionSchedule, err := plugincommon.GetTransmissionSchedule(
 		p.chainSupport,
-		maps.Keys(p.oracleIDToP2pID),
+		slices.Collect(maps.Keys(p.oracleIDToP2pID)),
 		p.offchainCfg.TransmissionDelayMultiplier,
 	)
 	if err != nil {
diff --git a/execute/plugin_test.go b/execute/plugin_test.go
@@ -5,6 +5,8 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
+	"iter"
+	"maps"
 	"slices"
 	"sort"
 	"strings"
@@ -20,7 +22,6 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
-	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/libocr/commontypes"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
@@ -97,7 +98,7 @@ func Test_getSeqNrRangesBySource(t *testing.T) {
 		for _, msg := range chainReport.Messages {
 			expectedSet[msg.Header.SequenceNumber] = struct{}{}
 		}
-		expectedSetSlice := maps.Keys(expectedSet)
+		expectedSetSlice := slices.Collect(maps.Keys(expectedSet))
 		actualSetSlice := seqNrRange.ToSlice()
 		sort.Slice(expectedSetSlice, func(i, j int) bool {
 			return expectedSetSlice[i] < expectedSetSlice[j]
@@ -126,7 +127,11 @@ func Test_checkAlreadyExecuted(t *testing.T) {
 				ccipReaderMock := readerpkg_mock.NewMockCCIPReader(t)
 
 				// map key order is undefined, but we can select any random one
-				sourceSel := maps.Keys(snRangeSetPairBySource)[0]
+				iterator := maps.Keys(snRangeSetPairBySource)
+				valFunc, _ := iter.Pull(iterator)
+				val, valid := valFunc()
+				require.True(t, valid)
+				sourceSel := val
 				ccipReaderMock.
 					EXPECT().
 					ExecutedMessages(
@@ -150,7 +155,11 @@ func Test_checkAlreadyExecuted(t *testing.T) {
 				ccipReaderMock := readerpkg_mock.NewMockCCIPReader(t)
 
 				// map key order is undefined, but we can select any random one
-				sourceSel := maps.Keys(snRangeSetPairBySource)[0]
+				iterator := maps.Keys(snRangeSetPairBySource)
+				valFunc, _ := iter.Pull(iterator)
+				val, valid := valFunc()
+				require.True(t, valid)
+				sourceSel := val
 				fullRange := snRangeSetPairBySource[sourceSel][0].ToSlice()
 				ccipReaderMock.
 					EXPECT().
diff --git a/execute/tokendata/usdc/usdc.go b/execute/tokendata/usdc/usdc.go
diff --git a/go.mod b/go.mod
diff --git a/internal/plugincommon/discovery/processor.go b/internal/plugincommon/discovery/processor.go
diff --git a/pkg/chainaccessor/default_accessor.go b/pkg/chainaccessor/default_accessor.go
diff --git a/pkg/contractreader/observed.go b/pkg/contractreader/observed.go
diff --git a/pkg/reader/ccip.go b/pkg/reader/ccip.go
diff --git a/pkg/reader/usdc_reader_test.go b/pkg/reader/usdc_reader_test.go
