From be1eed6faf4ad1060b0d452e6c37e924f1cc266b Mon Sep 17 00:00:00 2001
From: AnieeG <anindita.ghosh@smartcontract.com>
Date: Thu, 5 Dec 2024 13:24:09 -0800
Subject: [PATCH] fix

---
 deployment/ccip/changeset/state.go           | 10 ++--------
 deployment/environment/memory/environment.go |  3 ++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/deployment/ccip/changeset/state.go b/deployment/ccip/changeset/state.go
index 20763523141..bc73ff06e73 100644
--- a/deployment/ccip/changeset/state.go
+++ b/deployment/ccip/changeset/state.go
@@ -13,7 +13,6 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/pkg/errors"
-	chainsel "github.com/smartcontractkit/chain-selectors"
 
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/view"
@@ -242,12 +241,7 @@ type CCIPOnChainState struct {
 func (s CCIPOnChainState) View(chains []uint64) (map[string]view.ChainView, error) {
 	m := make(map[string]view.ChainView)
 	for _, chainSelector := range chains {
-		// TODO: Need a utility for this
-		chainid, err := chainsel.ChainIdFromSelector(chainSelector)
-		if err != nil {
-			return m, err
-		}
-		chainName, err := chainsel.NameFromChainId(chainid)
+		chainInfo, err := deployment.ChainInfo(chainSelector)
 		if err != nil {
 			return m, err
 		}
@@ -259,7 +253,7 @@ func (s CCIPOnChainState) View(chains []uint64) (map[string]view.ChainView, erro
 		if err != nil {
 			return m, err
 		}
-		m[chainName] = chainView
+		m[chainInfo.ChainName] = chainView
 	}
 	return m, nil
 }
diff --git a/deployment/environment/memory/environment.go b/deployment/environment/memory/environment.go
index 32000470c21..fa4fe8c7be9 100644
--- a/deployment/environment/memory/environment.go
+++ b/deployment/environment/memory/environment.go
@@ -3,6 +3,7 @@ package memory
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -69,7 +70,7 @@ func generateMemoryChain(t *testing.T, inputs map[uint64]EVMChain) map[uint64]de
 	chains := make(map[uint64]deployment.Chain)
 	for cid, chain := range inputs {
 		chain := chain
-		chainInfo, err := deployment.ChainInfo(cid)
+		chainInfo, err := chainsel.GetChainDetailsByChainIDAndFamily(strconv.FormatUint(cid, 10), chainsel.FamilyEVM)
 		require.NoError(t, err)
 		backend := NewBackend(chain.Backend)
 		chains[chainInfo.ChainSelector] = deployment.Chain{