Merge branch 'main' of github.com:smartcontractkit/chain-selectors in…

…to gen-rs

# Conflicts:
#	genchains_solana.go

selectors.go

@@ -52,7 +52,7 @@ func getChainInfo(selector uint64) (chainInfo, error) {
 			return chainInfo{}, fmt.Errorf("failed to get %s chain ID from selector %d: %w", chainID, selector, err)
 		}
 
-		details, exist := solanaSelectorsMap[chainID]
+		details, exist := solanaChainIdToChainSelector[chainID]
 		if !exist {
 			return chainInfo{}, fmt.Errorf("invalid chain id %s for %s", chainID, family)
 		}
@@ -123,7 +123,7 @@ func GetChainDetailsByChainIDAndFamily(chainID string, family string) (ChainDeta
 
 		return details, nil
 	case FamilySolana:
-		details, exist := solanaSelectorsMap[chainID]
+		details, exist := solanaChainIdToChainSelector[chainID]
 		if !exist {
 			return ChainDetails{}, fmt.Errorf("invalid chain id %s for %s", chainID, family)
 		}

solana.go

@@ -13,15 +13,34 @@ import (
 //go:embed selectors_solana.yml
 var solanaSelectorsYml []byte
 
+//go:embed test_selectors_solana.yml
+var testSelectorsSolanaYml []byte
+
 var (
-	solanaSelectorsMap      = parseSolanaYml(solanaSelectorsYml)
-	solanaChainIdBySelector = make(map[uint64]string)
+	solanaSelectorsMap           = parseSolanaYml(solanaSelectorsYml)
+	solanaTestSelectorsMap       = parseSolanaYml(testSelectorsSolanaYml)
+	solanaChainIdToChainSelector = loadAllSolanaSelectors()
+	solanaChainIdBySelector      = make(map[uint64]string)
 )
 
 func init() {
 	for k, v := range solanaSelectorsMap {
 		solanaChainIdBySelector[v.ChainSelector] = k
 	}
+	for k, v := range solanaTestSelectorsMap {
+		solanaChainIdBySelector[v.ChainSelector] = k
+	}
+}
+
+func loadAllSolanaSelectors() map[string]ChainDetails {
+	output := make(map[string]ChainDetails, len(solanaSelectorsMap)+len(solanaTestSelectorsMap))
+	for k, v := range solanaSelectorsMap {
+		output[k] = v
+	}
+	for k, v := range solanaTestSelectorsMap {
+		output[k] = v
+	}
+	return output
 }
 
 func parseSolanaYml(ymlFile []byte) map[string]ChainDetails {
@@ -52,15 +71,15 @@ func validateSolanaChainID(data map[string]ChainDetails) {
 }
 
 func SolanaChainIdToChainSelector() map[string]uint64 {
-	copyMap := make(map[string]uint64, len(solanaSelectorsMap))
-	for k, v := range solanaSelectorsMap {
+	copyMap := make(map[string]uint64, len(solanaChainIdToChainSelector))
+	for k, v := range solanaChainIdToChainSelector {
 		copyMap[k] = v.ChainSelector
 	}
 	return copyMap
 }
 
 func SolanaNameFromChainId(chainId string) (string, error) {
-	details, exist := solanaSelectorsMap[chainId]
+	details, exist := solanaChainIdToChainSelector[chainId]
 	if !exist {
 		return "", fmt.Errorf("chain name not found for chain %v", chainId)
 	}

solana_test.go

@@ -84,3 +84,10 @@ func Test_SolanaGetChainIDByChainSelector(t *testing.T) {
 		assert.Equal(t, chainID, fmt.Sprintf("%v", k))
 	}
 }
+
+func Test_SolanaNoOverlapBetweenRealAndTestChains(t *testing.T) {
+	for k, _ := range solanaSelectorsMap {
+		_, exist := solanaTestSelectorsMap[k]
+		assert.False(t, exist, "Chain %d is duplicated between real and test chains", k)
+	}
+}

test_selectors_solana.yml

@@ -0,0 +1,9 @@
+selectors:
+  # "11111111111111111111111111111111111111111111" -> system program address
+  "22222222222222222222222222222222222222222222":
+    selector: 12463857294658392847
+  "33333333333333333333333333333333333333333333":
+    selector: 9837465928374658293
+  "44444444444444444444444444444444444444444444":
+    selector: 16574839267584930184
+