Skip to content

Commit f6a685f

Browse files
fix(fork-tests): don't use AddressBook/DataStore to filter chains (#1045)
We already filter the networks by checking the chain selectors passed when loading the environment via `OnlyChainFor`. The AddressBook and DataStore filters are not needed and actually cause problems if a domain isn't using either of them.
1 parent e31c0ae commit f6a685f

3 files changed

Lines changed: 5 additions & 24 deletions

File tree

.changeset/nine-swans-see.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"chainlink-deployments-framework": patch
3+
---
4+
5+
fix(fork-tests): don't use AddressBook/DataStore to filter chains

engine/cld/environment/anvil.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import (
2626
fchain "github.com/smartcontractkit/chainlink-deployments-framework/chain"
2727
fevm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
2828
evmprov "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm/provider"
29-
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
30-
fdeployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
3129
cfgenv "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/config/env"
3230
cfgnet "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/config/network"
3331
)
@@ -130,8 +128,6 @@ type AnvilChainsOutput struct {
130128
func newAnvilChains(
131129
ctx context.Context,
132130
lggr logger.Logger,
133-
addressBook fdeployment.AddressBook,
134-
dataStore datastore.DataStore,
135131
evmNetworks *cfgnet.Config,
136132
blockNumbers map[uint64]*big.Int,
137133
onchainConfig cfgenv.OnchainConfig,
@@ -162,17 +158,6 @@ func newAnvilChains(
162158

163159
chainConfigsBySelector := make(map[uint64]ChainConfig)
164160
anvilClients := make(map[uint64]ForkedOnchainClient)
165-
addressesByChain, err1 := addressBook.Addresses()
166-
if err1 != nil {
167-
return nil, fmt.Errorf("failed to get addresses by chain selector: %w", err1)
168-
}
169-
dataStoreAddresses, err1 := dataStore.Addresses().Fetch()
170-
if err1 != nil {
171-
return nil, fmt.Errorf("failed to get addresses from data store: %w", err1)
172-
}
173-
for _, address := range dataStoreAddresses {
174-
addressesByChain[address.ChainSelector] = map[string]fdeployment.TypeAndVersion{}
175-
}
176161

177162
var once sync.Once
178163
blockChains := make([]fchain.BlockChain, 0, len(filteredEvmNetworks))
@@ -225,13 +210,6 @@ func newAnvilChains(
225210
continue
226211
}
227212

228-
// Skip chains that are not included in the address book
229-
if _, ok := addressesByChain[chainSelector]; !ok {
230-
lggr.Infof("Excluding chain with selector %d from environment, does not have addresses defined in the address book", chainSelector)
231-
232-
continue
233-
}
234-
235213
var signerGenerator evmprov.SignerGenerator
236214
if kmsConfig.KeyID != "" {
237215
var terr error

engine/cld/environment/fork.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ func LoadFork(
9191
anvilOutput, err := newAnvilChains(
9292
ctx,
9393
lggr,
94-
addressBook,
95-
dataStore,
9694
networks,
9795
blockNumbers,
9896
cfg.Env.Onchain,

0 commit comments

Comments
 (0)