Skip to content

Commit 6b7d438

Browse files
committed
Fixed incorret order of initialization
1 parent 52f78f2 commit 6b7d438

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

cmd/collection/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,14 @@ func main() {
250250

251251
return validator, err
252252
}).
253+
Component("finalized snapshot", func(node *cmd.NodeConfig) (module.ReadyDoneAware, error) {
254+
finalizedHeader, err = consync.NewFinalizedHeaderCache(node.Logger, node.State, finalizationDistributor)
255+
if err != nil {
256+
return nil, fmt.Errorf("could not create finalized snapshot cache: %w", err)
257+
}
258+
259+
return finalizedHeader, nil
260+
}).
253261
Component("consensus committee", func(node *cmd.NodeConfig) (module.ReadyDoneAware, error) {
254262
// initialize consensus committee's membership state
255263
// This committee state is for the HotStuff follower, which follows the MAIN CONSENSUS Committee
@@ -330,14 +338,6 @@ func main() {
330338

331339
return followerEng, nil
332340
}).
333-
Component("finalized snapshot", func(node *cmd.NodeConfig) (module.ReadyDoneAware, error) {
334-
finalizedHeader, err = consync.NewFinalizedHeaderCache(node.Logger, node.State, finalizationDistributor)
335-
if err != nil {
336-
return nil, fmt.Errorf("could not create finalized snapshot cache: %w", err)
337-
}
338-
339-
return finalizedHeader, nil
340-
}).
341341
Component("main chain sync engine", func(node *cmd.NodeConfig) (module.ReadyDoneAware, error) {
342342

343343
// create a block synchronization engine to handle follower getting out of sync

cmd/execution_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ func (builder *ExecutionNodeBuilder) LoadComponentsAndModules() {
199199
Component("provider engine", exeNode.LoadProviderEngine).
200200
Component("checker engine", exeNode.LoadCheckerEngine).
201201
Component("ingestion engine", exeNode.LoadIngestionEngine).
202+
Component("finalized snapshot", exeNode.LoadFinalizedSnapshot).
202203
Component("consensus committee", exeNode.LoadConsensusCommittee).
203204
Component("follower core", exeNode.LoadFollowerCore).
204205
Component("follower engine", exeNode.LoadFollowerEngine).
205206
Component("collection requester engine", exeNode.LoadCollectionRequesterEngine).
206207
Component("receipt provider engine", exeNode.LoadReceiptProviderEngine).
207-
Component("finalized snapshot", exeNode.LoadFinalizedSnapshot).
208208
Component("synchronization engine", exeNode.LoadSynchronizationEngine).
209209
Component("grpc server", exeNode.LoadGrpcServer)
210210
}

cmd/verification_builder.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,15 @@ func (v *VerificationNodeBuilder) LoadComponentsAndModules() {
305305

306306
return blockConsumer, nil
307307
}).
308+
Component("finalized snapshot", func(node *NodeConfig) (module.ReadyDoneAware, error) {
309+
var err error
310+
finalizedHeader, err = commonsync.NewFinalizedHeaderCache(node.Logger, node.State, finalizationDistributor)
311+
if err != nil {
312+
return nil, fmt.Errorf("could not create finalized snapshot cache: %w", err)
313+
}
314+
315+
return finalizedHeader, nil
316+
}).
308317
Component("consensus committee", func(node *NodeConfig) (module.ReadyDoneAware, error) {
309318
// initialize consensus committee's membership state
310319
// This committee state is for the HotStuff follower, which follows the MAIN CONSENSUS Committee
@@ -393,15 +402,6 @@ func (v *VerificationNodeBuilder) LoadComponentsAndModules() {
393402

394403
return followerEng, nil
395404
}).
396-
Component("finalized snapshot", func(node *NodeConfig) (module.ReadyDoneAware, error) {
397-
var err error
398-
finalizedHeader, err = commonsync.NewFinalizedHeaderCache(node.Logger, node.State, finalizationDistributor)
399-
if err != nil {
400-
return nil, fmt.Errorf("could not create finalized snapshot cache: %w", err)
401-
}
402-
403-
return finalizedHeader, nil
404-
}).
405405
Component("sync engine", func(node *NodeConfig) (module.ReadyDoneAware, error) {
406406
sync, err := commonsync.New(
407407
node.Logger,

0 commit comments

Comments
 (0)