Remove mock adapter from environment struct

smartcontractkit · Nov 19, 2024 · 9227413 · 9227413
1 parent 03115e8
commit 9227413
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/deployment/environment.go b/deployment/environment.go
@@ -14,7 +14,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"
 	chain_selectors "github.com/smartcontractkit/chain-selectors"
-	"github.com/smartcontractkit/chainlink-testing-framework/lib/docker/test_env"
 	types2 "github.com/smartcontractkit/libocr/offchainreporting2/types"
 	types3 "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	"google.golang.org/grpc"
@@ -76,7 +75,6 @@ type Environment struct {
 	Chains            map[uint64]Chain
 	NodeIDs           []string
 	Offchain          OffchainClient
-	MockAdapter       *test_env.Killgrave
 }
 
 func NewEnvironment(

diff --git a/integration-tests/ccip-tests/testsetups/test_helpers.go b/integration-tests/ccip-tests/testsetups/test_helpers.go
@@ -108,7 +108,6 @@ func NewLocalDevEnvironment(
 	require.NoError(t, err)
 	require.NotNil(t, e)
 	e.ExistingAddresses = ab
-	e.MockAdapter = testEnv.MockAdapter
 
 	envNodes, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
 	require.NoError(t, err)

diff --git a/integration-tests/smoke/ccip_usdc_test.go b/integration-tests/smoke/ccip_usdc_test.go
@@ -43,9 +43,9 @@ func TestUSDCTokenTransfer(t *testing.T) {
 		defer server.Close()
 		endpoint = server.URL
 	} else {
-		err := actions.SetMockServerWithUSDCAttestation(tenv.Env.MockAdapter, nil)
+		err := actions.SetMockServerWithUSDCAttestation(cluster.MockAdapter, nil)
 		require.NoError(t, err)
-		endpoint = tenv.Env.MockAdapter.InternalEndpoint
+		endpoint = cluster.MockAdapter.InternalEndpoint
 	}
 
 	e := tenv.Env