Skip to content

Commit

Permalink
[TT-849] Move TestConfig's common parts to CTF (#13046)
Browse files Browse the repository at this point in the history 
* use latest Seth

* move test config to CTF

* use latest CTF that fixes eth2 genesis generation

* use latest Seth

* use tagged CTF version
  • Loading branch information
@Tofel
Tofel authored May 6, 2024
1 parent 36cc95f commit 09f8c7f
Show file tree
Hide file tree
Showing 28 changed files with 84 additions and 107 deletions.
8 changes: 4 additions & 4 deletions integration-tests/actions/private_network.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package actions
import (
"github.com/rs/zerolog"

ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
)

func EthereumNetworkConfigFromConfig(l zerolog.Logger, config tc.GlobalTestConfig) (network ctf_test_env.EthereumNetwork, err error) {
func EthereumNetworkConfigFromConfig(l zerolog.Logger, config ctf_config.GlobalTestConfig) (network ctf_test_env.EthereumNetwork, err error) {
if config.GetPrivateEthereumNetworkConfig() == nil {
l.Warn().Msg("No TOML private ethereum network config found, will use old geth")
ethBuilder := ctf_test_env.NewEthereumNetworkBuilder()
network, err = ethBuilder.
WithEthereumVersion(ctf_test_env.EthereumVersion_Eth1).
WithExecutionLayer(ctf_test_env.ExecutionLayer_Geth).
WithEthereumVersion(ctf_config.EthereumVersion_Eth1).
WithExecutionLayer(ctf_config.ExecutionLayer_Geth).
Build()

return
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/actions/vrf/vrfv2/setup_steps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ func SetupVRFV2ForNewEnv(
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&testConfig).
WithPrivateEthereumNetwork(network).
WithPrivateEthereumNetwork(network.EthereumNetworkConfig).
WithCLNodes(len(newEnvConfig.NodesToCreate)).
WithFunding(big.NewFloat(*testConfig.Common.ChainlinkNodeFunding)).
WithCustomCleanup(cleanupFn).
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/actions/vrf/vrfv2plus/setup_steps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ func SetupVRFV2PlusForNewEnv(
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&testConfig).
WithPrivateEthereumNetwork(network).
WithPrivateEthereumNetwork(network.EthereumNetworkConfig).
WithCLNodes(len(newEnvConfig.NodesToCreate)).
WithFunding(big.NewFloat(*testConfig.Common.ChainlinkNodeFunding)).
WithCustomCleanup(cleanupFn).
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/docker/cmd/internal/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var StartNodesCmd = &cobra.Command{

_, err = test_env.NewCLTestEnvBuilder().
WithTestConfig(&config).
WithPrivateEthereumNetwork(network).
WithPrivateEthereumNetwork(network.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodes(nodeCount).
WithoutCleanup().
Expand Down
31 changes: 16 additions & 15 deletions integration-tests/docker/test_env/test_env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
tc "github.com/testcontainers/testcontainers-go"

"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
"github.com/smartcontractkit/chainlink-testing-framework/docker"
"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
"github.com/smartcontractkit/chainlink-testing-framework/logging"
Expand All @@ -29,7 +30,6 @@ import (
"github.com/smartcontractkit/chainlink/integration-tests/client"
"github.com/smartcontractkit/chainlink/integration-tests/contracts"
d "github.com/smartcontractkit/chainlink/integration-tests/docker"
core_testconfig "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
)

var (
Expand All @@ -40,7 +40,7 @@ type CLClusterTestEnv struct {
Cfg *TestEnvConfig
DockerNetwork *tc.DockerNetwork
LogStream *logstream.LogStream
TestConfig core_testconfig.GlobalTestConfig
TestConfig ctf_config.GlobalTestConfig

/* components */
ClCluster *ClCluster
Expand All @@ -49,7 +49,7 @@ type CLClusterTestEnv struct {
sethClients map[int64]*seth.Client
ContractDeployer contracts.ContractDeployer
ContractLoader contracts.ContractLoader
PrivateEthereumConfigs []*test_env.EthereumNetwork // new approach to private chains, supporting eth1 and eth2
PrivateEthereumConfigs []*ctf_config.EthereumNetworkConfig
EVMNetworks []*blockchain.EVMNetwork
rpcProviders map[int64]*test_env.RpcProvider
l zerolog.Logger
Expand Down Expand Up @@ -95,18 +95,11 @@ func (te *CLClusterTestEnv) ParallelTransactions(enabled bool) {
}
}

func (te *CLClusterTestEnv) StartEthereumNetwork(cfg *test_env.EthereumNetwork) (blockchain.EVMNetwork, test_env.RpcProvider, error) {
func (te *CLClusterTestEnv) StartEthereumNetwork(cfg *ctf_config.EthereumNetworkConfig) (blockchain.EVMNetwork, test_env.RpcProvider, error) {
// if environment is being restored from a previous state, use the existing config
// this might fail terribly if temporary folders with chain data on the host machine were removed
if te.Cfg != nil && te.Cfg.EthereumNetwork != nil {
builder := test_env.NewEthereumNetworkBuilder()
c, err := builder.WithExistingConfig(*te.Cfg.EthereumNetwork).
WithTest(te.t).
Build()
if err != nil {
return blockchain.EVMNetwork{}, test_env.RpcProvider{}, err
}
cfg = &c
if te.Cfg != nil && te.Cfg.EthereumNetworkConfig != nil {
cfg = te.Cfg.EthereumNetworkConfig
}

te.l.Info().
Expand All @@ -115,7 +108,15 @@ func (te *CLClusterTestEnv) StartEthereumNetwork(cfg *test_env.EthereumNetwork)
Str("Custom Docker Images", fmt.Sprintf("%v", cfg.CustomDockerImages)).
Msg("Starting Ethereum network")

n, rpc, err := cfg.Start()
builder := test_env.NewEthereumNetworkBuilder()
c, err := builder.WithExistingConfig(*cfg).
WithTest(te.t).
Build()
if err != nil {
return blockchain.EVMNetwork{}, test_env.RpcProvider{}, err
}

n, rpc, err := c.Start()

if err != nil {
return blockchain.EVMNetwork{}, test_env.RpcProvider{}, err
Expand All @@ -129,7 +130,7 @@ func (te *CLClusterTestEnv) StartMockAdapter() error {
}

// pass config here
func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count int, secretsConfig string, testconfig core_testconfig.GlobalTestConfig, opts ...ClNodeOption) error {
func (te *CLClusterTestEnv) StartClCluster(nodeConfig *chainlink.Config, count int, secretsConfig string, testconfig ctf_config.GlobalTestConfig, opts ...ClNodeOption) error {
if te.Cfg != nil && te.Cfg.ClCluster != nil {
te.ClCluster = te.Cfg.ClCluster
} else {
Expand Down
14 changes: 7 additions & 7 deletions integration-tests/docker/test_env/test_env_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/smartcontractkit/seth"

"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
"github.com/smartcontractkit/chainlink-testing-framework/logging"
"github.com/smartcontractkit/chainlink-testing-framework/logstream"
Expand All @@ -23,7 +24,6 @@ import (

actions_seth "github.com/smartcontractkit/chainlink/integration-tests/actions/seth"
"github.com/smartcontractkit/chainlink/integration-tests/contracts"
tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
"github.com/smartcontractkit/chainlink/integration-tests/types/config/node"
"github.com/smartcontractkit/chainlink/integration-tests/utils"
)
Expand Down Expand Up @@ -56,8 +56,8 @@ type CLTestEnvBuilder struct {
cleanUpCustomFn func()
chainOptionsFn []ChainOption
evmClientNetworkOption []EVMClientNetworkOption
privateEthereumNetworks []*test_env.EthereumNetwork
testConfig tc.GlobalTestConfig
privateEthereumNetworks []*ctf_config.EthereumNetworkConfig
testConfig ctf_config.GlobalTestConfig

/* funding */
ETHFunds *big.Float
Expand Down Expand Up @@ -120,7 +120,7 @@ func (b *CLTestEnvBuilder) WithCLNodes(clNodesCount int) *CLTestEnvBuilder {
return b
}

func (b *CLTestEnvBuilder) WithTestConfig(cfg tc.GlobalTestConfig) *CLTestEnvBuilder {
func (b *CLTestEnvBuilder) WithTestConfig(cfg ctf_config.GlobalTestConfig) *CLTestEnvBuilder {
b.testConfig = cfg
return b
}
Expand All @@ -146,12 +146,12 @@ func (b *CLTestEnvBuilder) WithSeth() *CLTestEnvBuilder {
return b
}

func (b *CLTestEnvBuilder) WithPrivateEthereumNetwork(en test_env.EthereumNetwork) *CLTestEnvBuilder {
func (b *CLTestEnvBuilder) WithPrivateEthereumNetwork(en ctf_config.EthereumNetworkConfig) *CLTestEnvBuilder {
b.privateEthereumNetworks = append(b.privateEthereumNetworks, &en)
return b
}

func (b *CLTestEnvBuilder) WithPrivateEthereumNetworks(ens []*test_env.EthereumNetwork) *CLTestEnvBuilder {
func (b *CLTestEnvBuilder) WithPrivateEthereumNetworks(ens []*ctf_config.EthereumNetworkConfig) *CLTestEnvBuilder {
b.privateEthereumNetworks = ens
return b
}
Expand Down Expand Up @@ -300,7 +300,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
if err != nil {
return nil, err
}
b.privateEthereumNetworks[i] = &netWithLs
b.privateEthereumNetworks[i] = &netWithLs.EthereumNetworkConfig
}
}

Expand Down
12 changes: 6 additions & 6 deletions integration-tests/docker/test_env/test_env_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ package test_env
import (
"encoding/json"

cte "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
env "github.com/smartcontractkit/chainlink/integration-tests/types/envcommon"
)

type TestEnvConfig struct {
Networks []string `json:"networks"`
Geth GethConfig `json:"geth"`
MockAdapter MockAdapterConfig `json:"mock_adapter"`
ClCluster *ClCluster `json:"clCluster"`
EthereumNetwork *cte.EthereumNetwork `json:"private_ethereum_config"`
Networks []string `json:"networks"`
Geth GethConfig `json:"geth"`
MockAdapter MockAdapterConfig `json:"mock_adapter"`
ClCluster *ClCluster `json:"clCluster"`
EthereumNetworkConfig *ctf_config.EthereumNetworkConfig `json:"private_ethereum_config"`
}

type MockAdapterConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
github.com/slack-go/slack v0.12.2
github.com/smartcontractkit/chainlink-automation v1.0.3
github.com/smartcontractkit/chainlink-common v0.1.7-0.20240429120925-907b29311feb
github.com/smartcontractkit/chainlink-testing-framework v1.28.7
github.com/smartcontractkit/chainlink-testing-framework v1.28.8
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868
github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1529,8 +1529,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240422172640-59d47c73ba5
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240422172640-59d47c73ba58/go.mod h1:oV5gIuSKrPEcjQ6uB6smBsm5kXHxyydVLNyAs4V9CoQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240325075535-0f7eb05ee595 h1:y6ks0HsSOhPUueOmTcoxDQ50RCS1XINlRDTemZyHjFw=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240325075535-0f7eb05ee595/go.mod h1:vV6WfnVIbK5Q1JsIru4YcTG0T1uRpLJm6t2BgCnCSsg=
github.com/smartcontractkit/chainlink-testing-framework v1.28.7 h1:Yr93tBl5jVx1cfKywt0C0cbuObDPJ6JIU4FIsZ6bZlM=
github.com/smartcontractkit/chainlink-testing-framework v1.28.7/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
github.com/smartcontractkit/chainlink-testing-framework v1.28.8 h1:EaxNwB/16wpISzaUn2WJ4bE3TawD3joEekIlQuWNRGo=
github.com/smartcontractkit/chainlink-testing-framework v1.28.8/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs=
github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo=
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/functions/onchain_monitoring.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/smartcontractkit/wasp"

tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
)

/* Monitors on-chain stats of LoadConsumer and pushes them to Loki every second */
Expand All @@ -25,7 +25,7 @@ type LoadStats struct {
Empty uint32
}

func MonitorLoadStats(t *testing.T, ft *FunctionsTest, labels map[string]string, config tc.GlobalTestConfig) {
func MonitorLoadStats(t *testing.T, ft *FunctionsTest, labels map[string]string, config ctf_config.GlobalTestConfig) {
go func() {
updatedLabels := make(map[string]string)
for k, v := range labels {
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/functions/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (

"github.com/smartcontractkit/chainlink-testing-framework/networks"

ctf_config "github.com/smartcontractkit/chainlink-testing-framework/config"
"github.com/smartcontractkit/chainlink/integration-tests/contracts"
tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
"github.com/smartcontractkit/chainlink/integration-tests/types"
"github.com/smartcontractkit/chainlink/integration-tests/utils"
chainlinkutils "github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
Expand Down Expand Up @@ -50,7 +50,7 @@ type S4SecretsCfg struct {
S4SetPayload string
}

func SetupLocalLoadTestEnv(globalConfig tc.GlobalTestConfig, functionsConfig types.FunctionsTestConfig) (*FunctionsTest, error) {
func SetupLocalLoadTestEnv(globalConfig ctf_config.GlobalTestConfig, functionsConfig types.FunctionsTestConfig) (*FunctionsTest, error) {
selectedNetwork := networks.MustGetSelectedNetworkConfig(globalConfig.GetNetworkConfig())[0]
readSethCfg := globalConfig.GetSethConfig()
sethCfg, err := utils.MergeSethAndEvmNetworkConfigs(selectedNetwork, *readSethCfg)
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ require (
github.com/slack-go/slack v0.12.2
github.com/smartcontractkit/chainlink-automation v1.0.3
github.com/smartcontractkit/chainlink-common v0.1.7-0.20240429120925-907b29311feb
github.com/smartcontractkit/chainlink-testing-framework v1.28.7
github.com/smartcontractkit/chainlink-testing-framework v1.28.8
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c
github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8
github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c
github.com/smartcontractkit/seth v0.1.6
github.com/smartcontractkit/seth v0.1.6-0.20240429143720-cacb8160ecec
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1
github.com/smartcontractkit/wasp v0.4.6
github.com/stretchr/testify v1.9.0
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/load/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1512,8 +1512,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240422172640-59d47c73ba5
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240422172640-59d47c73ba58/go.mod h1:oV5gIuSKrPEcjQ6uB6smBsm5kXHxyydVLNyAs4V9CoQ=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240325075535-0f7eb05ee595 h1:y6ks0HsSOhPUueOmTcoxDQ50RCS1XINlRDTemZyHjFw=
github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240325075535-0f7eb05ee595/go.mod h1:vV6WfnVIbK5Q1JsIru4YcTG0T1uRpLJm6t2BgCnCSsg=
github.com/smartcontractkit/chainlink-testing-framework v1.28.7 h1:Yr93tBl5jVx1cfKywt0C0cbuObDPJ6JIU4FIsZ6bZlM=
github.com/smartcontractkit/chainlink-testing-framework v1.28.7/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
github.com/smartcontractkit/chainlink-testing-framework v1.28.8 h1:EaxNwB/16wpISzaUn2WJ4bE3TawD3joEekIlQuWNRGo=
github.com/smartcontractkit/chainlink-testing-framework v1.28.8/go.mod h1:x1zDOz8zcLjEvs9fNA9y/DMguLam/2+CJdpxX0+rM8A=
github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240227164431-18a7065e23ea h1:ZdLmNAfKRjH8AYUvjiiDGUgiWQfq/7iNpxyTkvjx/ko=
github.com/smartcontractkit/chainlink-testing-framework/grafana v0.0.0-20240227164431-18a7065e23ea/go.mod h1:gCKC9w6XpNk6jm+XIk2psrkkfxhi421N9NSiFceXW88=
github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8=
Expand All @@ -1524,8 +1524,8 @@ github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJ
github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0=
github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c h1:lIyMbTaF2H0Q71vkwZHX/Ew4KF2BxiKhqEXwF8rn+KI=
github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c/go.mod h1:fb1ZDVXACvu4frX3APHZaEBp0xi1DIm34DcA0CwTsZM=
github.com/smartcontractkit/seth v0.1.6 h1:exU96KiKM/gxvp7OR8KkOXnTgbtFNepdhMBvyobFKCw=
github.com/smartcontractkit/seth v0.1.6/go.mod h1:2TMOZQ8WTAw7rR1YBbXpnad6VmT/+xDd/nXLmB7Eero=
github.com/smartcontractkit/seth v0.1.6-0.20240429143720-cacb8160ecec h1:BT1loU6TT2YqMenD7XE+aw7IeeTiC25+r1TLKAySVIg=
github.com/smartcontractkit/seth v0.1.6-0.20240429143720-cacb8160ecec/go.mod h1:2TMOZQ8WTAw7rR1YBbXpnad6VmT/+xDd/nXLmB7Eero=
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE=
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg=
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/migration/upgrade_version_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestVersionUpgrade(t *testing.T) {
WithTestConfig(&config).
WithTestInstance(t).
WithStandardCleanup().
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithCLNodes(1).
WithStandardCleanup().
WithSeth().
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/smoke/automation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ func setupAutomationTestDocker(
env, err = test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(automationTestConfig).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithFunding(big.NewFloat(*automationTestConfig.GetCommonConfig().ChainlinkNodeFunding)).
WithStandardCleanup().
Expand Down Expand Up @@ -1200,7 +1200,7 @@ func setupAutomationTestDocker(
env, err = test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(automationTestConfig).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodes(clNodesCount).
WithCLNodeConfig(clNodeConfig).
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/smoke/cron_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestCronBasic(t *testing.T) {
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodes(1).
WithStandardCleanup().
Expand Down Expand Up @@ -88,7 +88,7 @@ func TestCronJobReplacement(t *testing.T) {
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodes(1).
WithStandardCleanup().
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/flux_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestFluxBasic(t *testing.T) {
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodes(3).
WithStandardCleanup().
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/forwarder_ocr_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestForwarderOCRBasic(t *testing.T) {
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithForwarders().
WithCLNodes(6).
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/forwarders_ocr2_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestForwarderOCR2Basic(t *testing.T) {
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(&config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithMockAdapter().
WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
node.WithOCR2(),
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ func setupKeeperTest(l zerolog.Logger, t *testing.T, config *tc.TestConfig) (
env, err := test_env.NewCLTestEnvBuilder().
WithTestInstance(t).
WithTestConfig(config).
WithPrivateEthereumNetwork(privateNetwork).
WithPrivateEthereumNetwork(privateNetwork.EthereumNetworkConfig).
WithCLNodes(5).
WithCLNodeConfig(clNodeConfig).
WithFunding(big.NewFloat(.5)).
Expand Down
Loading

0 comments on commit 09f8c7f

Please sign in to comment.