Skip to content

Commit e11b6b6

Browse files
ChrisAmoraChrisAmora
committed
feat: use testutil
1 parent 3b70501 commit e11b6b6

5 files changed

+30
-25
lines changed

‎deployment/data-streams/changeset/call_configurator_promote_staging_config_test.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@ import (
1414
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
1515
"github.com/smartcontractkit/chainlink/deployment"
1616
"github.com/smartcontractkit/chainlink/deployment/common/types"
17+
"github.com/smartcontractkit/chainlink/deployment/data-streams/changeset/testutil"
1718
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/configurator"
1819
)
1920

2021
func TestCallPromoteStagingConfig(t *testing.T) {
21-
e := newMemoryEnv(t)
22+
e := testutil.NewMemoryEnv(t, true)
2223
ctx := testcontext.Get(t)
2324

24-
deployConf := DeployConfiguratorConfig{ChainsToDeploy: []uint64{TestChain.Selector}}
25+
deployConf := DeployConfiguratorConfig{ChainsToDeploy: []uint64{testutil.TestChain.Selector}}
2526
out, err := DeployConfigurator{}.Apply(e, deployConf)
2627
require.NoError(t, err)
2728

@@ -30,7 +31,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
3031
require.Len(t, ab, 1)
3132

3233
var configuratorAddr common.Address
33-
for addr, tv := range ab[TestChain.Selector] {
34+
for addr, tv := range ab[testutil.TestChain.Selector] {
3435
require.Equal(t, types.Configurator, tv.Type)
3536
require.Equal(t, deployment.Version1_0_0, tv.Version)
3637
configuratorAddr = common.HexToAddress(addr)
@@ -59,7 +60,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
5960

6061
callProd := SetProductionConfigConfig{
6162
ConfigurationsByChain: map[uint64][]SetProductionConfig{
62-
TestChain.Selector: {prodCfg},
63+
testutil.TestChain.Selector: {prodCfg},
6364
},
6465
MCMSConfig: nil,
6566
}
@@ -76,7 +77,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
7677
Addresses: []common.Address{configuratorAddr},
7778
Topics: [][]common.Hash{{configAbi.Events["ProductionConfigSet"].ID}},
7879
}
79-
prodLogs, err := e.Chains[TestChain.Selector].Client.FilterLogs(ctx, prodFilterQuery)
80+
prodLogs, err := e.Chains[testutil.TestChain.Selector].Client.FilterLogs(ctx, prodFilterQuery)
8081
require.NoError(t, err)
8182
require.NotEmpty(t, prodLogs)
8283

@@ -110,7 +111,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
110111

111112
callStaging := SetStagingConfigConfig{
112113
ConfigurationsByChain: map[uint64][]SetStagingConfig{
113-
TestChain.Selector: {stagingCfg},
114+
testutil.TestChain.Selector: {stagingCfg},
114115
},
115116
MCMSConfig: nil,
116117
}
@@ -120,7 +121,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
120121

121122
callPromote := PromoteStagingConfigConfig{
122123
PromotionsByChain: map[uint64][]PromoteStagingConfig{
123-
TestChain.Selector: {
124+
testutil.TestChain.Selector: {
124125
{
125126
ConfiguratorAddress: configuratorAddr,
126127
ConfigID: [32]byte{},
@@ -141,7 +142,7 @@ func TestCallPromoteStagingConfig(t *testing.T) {
141142
Addresses: []common.Address{configuratorAddr},
142143
Topics: [][]common.Hash{{configAbi.Events["PromoteStagingConfig"].ID}},
143144
}
144-
promoLogs, err := e.Chains[TestChain.Selector].Client.FilterLogs(ctx, promoFilterQuery)
145+
promoLogs, err := e.Chains[testutil.TestChain.Selector].Client.FilterLogs(ctx, promoFilterQuery)
145146
require.NoError(t, err)
146147
require.NotEmpty(t, promoLogs)
147148

‎deployment/data-streams/changeset/call_configurator_set_production_config_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ import (
99

1010
"github.com/smartcontractkit/chainlink/deployment"
1111
"github.com/smartcontractkit/chainlink/deployment/common/types"
12+
"github.com/smartcontractkit/chainlink/deployment/data-streams/changeset/testutil"
1213
)
1314

1415
func TestCallSetProductionConfig(t *testing.T) {
15-
e := newMemoryEnv(t)
16+
e := testutil.NewMemoryEnv(t, true)
1617

1718
deployConf := DeployConfiguratorConfig{
18-
ChainsToDeploy: []uint64{TestChain.Selector},
19+
ChainsToDeploy: []uint64{testutil.TestChain.Selector},
1920
}
2021
out, err := DeployConfigurator{}.Apply(e, deployConf)
2122
require.NoError(t, err)
@@ -25,7 +26,7 @@ func TestCallSetProductionConfig(t *testing.T) {
2526
require.Len(t, ab, 1)
2627

2728
var configuratorAddr common.Address
28-
for addr, tv := range ab[TestChain.Selector] {
29+
for addr, tv := range ab[testutil.TestChain.Selector] {
2930
require.Equal(t, types.Configurator, tv.Type)
3031
require.Equal(t, deployment.Version1_0_0, tv.Version)
3132
configuratorAddr = common.HexToAddress(addr)
@@ -57,7 +58,7 @@ func TestCallSetProductionConfig(t *testing.T) {
5758

5859
callConf := SetProductionConfigConfig{
5960
ConfigurationsByChain: map[uint64][]SetProductionConfig{
60-
TestChain.Selector: {prodCfg},
61+
testutil.TestChain.Selector: {prodCfg},
6162
},
6263
MCMSConfig: nil,
6364
}

‎deployment/data-streams/changeset/call_configurator_set_staging_config_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ import (
1414
"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
1515
"github.com/smartcontractkit/chainlink/deployment"
1616
"github.com/smartcontractkit/chainlink/deployment/common/types"
17+
"github.com/smartcontractkit/chainlink/deployment/data-streams/changeset/testutil"
1718
"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/llo-feeds/generated/configurator"
1819
)
1920

2021
func TestCallSetStagingConfig(t *testing.T) {
21-
e := newMemoryEnv(t)
22+
e := testutil.NewMemoryEnv(t, true)
2223

23-
deployConf := DeployConfiguratorConfig{ChainsToDeploy: []uint64{TestChain.Selector}}
24+
deployConf := DeployConfiguratorConfig{ChainsToDeploy: []uint64{testutil.TestChain.Selector}}
2425
out, err := DeployConfigurator{}.Apply(e, deployConf)
2526
require.NoError(t, err)
2627

@@ -29,7 +30,7 @@ func TestCallSetStagingConfig(t *testing.T) {
2930
require.Len(t, ab, 1)
3031

3132
var configuratorAddr common.Address
32-
for addr, tv := range ab[TestChain.Selector] {
33+
for addr, tv := range ab[testutil.TestChain.Selector] {
3334
require.Equal(t, types.Configurator, tv.Type)
3435
require.Equal(t, deployment.Version1_0_0, tv.Version)
3536
configuratorAddr = common.HexToAddress(addr)
@@ -57,7 +58,7 @@ func TestCallSetStagingConfig(t *testing.T) {
5758

5859
callProd := SetProductionConfigConfig{
5960
ConfigurationsByChain: map[uint64][]SetProductionConfig{
60-
TestChain.Selector: {prodCfg},
61+
testutil.TestChain.Selector: {prodCfg},
6162
},
6263
MCMSConfig: nil,
6364
}
@@ -76,7 +77,7 @@ func TestCallSetStagingConfig(t *testing.T) {
7677
Addresses: []common.Address{configuratorAddr},
7778
Topics: [][]common.Hash{{configAbi.Events["ProductionConfigSet"].ID}},
7879
}
79-
prodLogs, err := e.Chains[TestChain.Selector].Client.FilterLogs(ctx, filterQuery)
80+
prodLogs, err := e.Chains[testutil.TestChain.Selector].Client.FilterLogs(ctx, filterQuery)
8081
require.NoError(t, err)
8182
require.NotEmpty(t, prodLogs)
8283

@@ -106,7 +107,7 @@ func TestCallSetStagingConfig(t *testing.T) {
106107

107108
callStaging := SetStagingConfigConfig{
108109
ConfigurationsByChain: map[uint64][]SetStagingConfig{
109-
TestChain.Selector: {stagingCfg},
110+
testutil.TestChain.Selector: {stagingCfg},
110111
},
111112
MCMSConfig: nil,
112113
}

‎deployment/data-streams/changeset/call_set_channel_definitions_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ import (
88

99
"github.com/smartcontractkit/chainlink/deployment"
1010
"github.com/smartcontractkit/chainlink/deployment/common/types"
11+
"github.com/smartcontractkit/chainlink/deployment/data-streams/changeset/testutil"
1112
)
1213

1314
func TestCallSetChannelDefinitions(t *testing.T) {
14-
e := newMemoryEnv(t)
15+
e := testutil.NewMemoryEnv(t, true)
1516

1617
// Deploy a contract
1718
deployConf := DeployChannelConfigStoreConfig{
18-
ChainsToDeploy: []uint64{TestChain.Selector},
19+
ChainsToDeploy: []uint64{testutil.TestChain.Selector},
1920
}
2021
out, err := DeployChannelConfigStore{}.Apply(e, deployConf)
2122
require.NoError(t, err)
@@ -25,7 +26,7 @@ func TestCallSetChannelDefinitions(t *testing.T) {
2526
require.Len(t, ab, 1)
2627

2728
var channelConfigStoreAddr common.Address
28-
for addr, tv := range ab[TestChain.Selector] {
29+
for addr, tv := range ab[testutil.TestChain.Selector] {
2930
require.Equal(t, types.ChannelConfigStore, tv.Type)
3031
require.Equal(t, deployment.Version1_0_0, tv.Version)
3132

@@ -39,7 +40,7 @@ func TestCallSetChannelDefinitions(t *testing.T) {
3940
// Call the contract.
4041
callConf := SetChannelDefinitionsConfig{
4142
DefinitionsByChain: map[uint64]map[string]ChannelDefinition{
42-
TestChain.Selector: {
43+
testutil.TestChain.Selector: {
4344
channelConfigStoreAddr.String(): {
4445
ChannelConfigStore: channelConfigStoreAddr,
4546
DonID: 1,

‎deployment/data-streams/changeset/deploy_channel_config_store_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66
"github.com/stretchr/testify/require"
77

88
"github.com/smartcontractkit/chainlink/deployment/common/types"
9+
"github.com/smartcontractkit/chainlink/deployment/data-streams/changeset/testutil"
910
)
1011

1112
func TestDeployChannelConfigStore(t *testing.T) {
12-
e := newMemoryEnv(t)
13+
e := testutil.NewMemoryEnv(t, true)
1314
cc := DeployChannelConfigStoreConfig{
14-
ChainsToDeploy: []uint64{TestChain.Selector},
15+
ChainsToDeploy: []uint64{testutil.TestChain.Selector},
1516
}
1617
out, err := DeployChannelConfigStore{}.Apply(e, cc)
1718
require.NoError(t, err)
@@ -21,7 +22,7 @@ func TestDeployChannelConfigStore(t *testing.T) {
2122
require.Len(t, ab, 1)
2223

2324
for sel, addrMap := range ab {
24-
require.Equal(t, TestChain.Selector, sel)
25+
require.Equal(t, testutil.TestChain.Selector, sel)
2526
for _, tv := range addrMap {
2627
require.Equal(t, types.ChannelConfigStore, tv.Type)
2728
}

0 commit comments

Comments
 (0)