@@ -28,62 +28,63 @@ func makeApply(laneRegistry *LaneAdapterRegistry, mcmsRegistry *changesets.MCMSR
2828 reports := make ([]cldf_ops.Report [any , any ], 0 )
2929
3030 for _ , lane := range cfg .Lanes {
31- src , dest := & lane .Source , & lane .Dest
32- srcFamily , err := chain_selectors .GetSelectorFamily (src .Selector )
31+ chainA , chainB := & lane .ChainA , & lane .ChainB
32+ chainAFamily , err := chain_selectors .GetSelectorFamily (chainA .Selector )
3333 if err != nil {
3434 return cldf.ChangesetOutput {}, err
3535 }
36- srcAdapter , exists := laneRegistry .GetLaneAdapter (srcFamily , lane .Version )
36+ chainAAdapter , exists := laneRegistry .GetLaneAdapter (chainAFamily , lane .Version )
3737 if ! exists {
38- return cldf.ChangesetOutput {}, fmt .Errorf ("no ChainAdapter registered for chain family '%s'" , srcFamily )
38+ return cldf.ChangesetOutput {}, fmt .Errorf ("no ChainAdapter registered for chain family '%s'" , chainAFamily )
3939 }
40- destFamily , err := chain_selectors .GetSelectorFamily (dest .Selector )
40+ chainBFamily , err := chain_selectors .GetSelectorFamily (chainB .Selector )
4141 if err != nil {
4242 return cldf.ChangesetOutput {}, err
4343 }
44- destAdapter , exists := laneRegistry .GetLaneAdapter (destFamily , lane .Version )
44+ chainBAdapter , exists := laneRegistry .GetLaneAdapter (chainBFamily , lane .Version )
4545 if ! exists {
46- return cldf.ChangesetOutput {}, fmt .Errorf ("no ChainAdapter registered for chain family '%s'" , destFamily )
46+ return cldf.ChangesetOutput {}, fmt .Errorf ("no ChainAdapter registered for chain family '%s'" , chainBFamily )
4747 }
48- err = populateAddresses (& e , src , srcAdapter )
48+ err = populateAddresses (& e , chainA , chainAAdapter )
4949 if err != nil {
50- return cldf.ChangesetOutput {}, fmt .Errorf ("error fetching address for src chain %d: %w" , src .Selector , err )
50+ return cldf.ChangesetOutput {}, fmt .Errorf ("error fetching address for src chain %d: %w" , chainA .Selector , err )
5151 }
52- err = populateAddresses (& e , dest , destAdapter )
52+ err = populateAddresses (& e , chainB , chainBAdapter )
5353 if err != nil {
54- return cldf.ChangesetOutput {}, fmt .Errorf ("error fetching address for dest chain %d: %w" , dest .Selector , err )
54+ return cldf.ChangesetOutput {}, fmt .Errorf ("error fetching address for dest chain %d: %w" , chainB .Selector , err )
5555 }
5656 type lanePair struct {
57- chainA * ChainDefinition
58- chainB * ChainDefinition
59- adapter LaneAdapter
57+ src * ChainDefinition
58+ dest * ChainDefinition
59+ srcAdapter LaneAdapter
60+ destAdapter LaneAdapter
6061 }
6162 for _ , pair := range []lanePair {
62- {chainA : src , chainB : dest , adapter : srcAdapter },
63- {chainA : dest , chainB : src , adapter : destAdapter },
63+ {src : chainA , dest : chainB , srcAdapter : chainAAdapter , destAdapter : chainBAdapter },
64+ {src : chainB , dest : chainA , srcAdapter : chainBAdapter , destAdapter : chainAAdapter },
6465 } {
65- configureLaneReport , err := cldf_ops .ExecuteSequence (e .OperationsBundle , pair .adapter .ConfigureLaneLegAsSource (), e .BlockChains , UpdateLanesInput {
66- Source : pair .chainA ,
67- Dest : pair .chainB ,
66+ configureLaneReport , err := cldf_ops .ExecuteSequence (e .OperationsBundle , pair .srcAdapter .ConfigureLaneLegAsSource (), e .BlockChains , UpdateLanesInput {
67+ Source : pair .src ,
68+ Dest : pair .dest ,
6869 IsDisabled : lane .IsDisabled ,
6970 TestRouter : lane .TestRouter ,
7071 ExtraConfigs : lane .ExtraConfigs ,
7172 })
7273 if err != nil {
73- return cldf.ChangesetOutput {}, fmt .Errorf ("failed to configure token pool on chain with selector %d: %w" , src .Selector , err )
74+ return cldf.ChangesetOutput {}, fmt .Errorf ("failed to lane leg as source with selector %d: %w" , pair . src .Selector , err )
7475 }
7576 batchOps = append (batchOps , configureLaneReport .Output .BatchOps ... )
7677 reports = append (reports , configureLaneReport .ExecutionReports ... )
7778
78- configureLaneReport , err = cldf_ops .ExecuteSequence (e .OperationsBundle , pair .adapter .ConfigureLaneLegAsDest (), e .BlockChains , UpdateLanesInput {
79- Source : pair .chainA ,
80- Dest : pair .chainB ,
79+ configureLaneReport , err = cldf_ops .ExecuteSequence (e .OperationsBundle , pair .destAdapter .ConfigureLaneLegAsDest (), e .BlockChains , UpdateLanesInput {
80+ Source : pair .src ,
81+ Dest : pair .dest ,
8182 IsDisabled : lane .IsDisabled ,
8283 TestRouter : lane .TestRouter ,
8384 ExtraConfigs : lane .ExtraConfigs ,
8485 })
8586 if err != nil {
86- return cldf.ChangesetOutput {}, fmt .Errorf ("failed to configure lane leg as on chain with selector %d: %w" , dest .Selector , err )
87+ return cldf.ChangesetOutput {}, fmt .Errorf ("failed to configure lane leg as dest with selector %d: %w" , pair . dest .Selector , err )
8788 }
8889 batchOps = append (batchOps , configureLaneReport .Output .BatchOps ... )
8990 reports = append (reports , configureLaneReport .ExecutionReports ... )
0 commit comments