Skip to content

Commit 3e8679d

Browse files
committed
refactor(services): move service initialization to the Supervisor construction
This separation was made so that a initialization context (usually with a 'MaxStartupTime' timeout) is used to bound the service initialization, and leave 'Serve' method without a context argument so it is clear that 'Serve' is not controlled by a context object.
1 parent 5b3871e commit 3e8679d

12 files changed

Lines changed: 115 additions & 104 deletions

File tree

cmd/cartesi-rollups-advancer/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ func run(cmd *cobra.Command, args []string) {
131131
TelemetryAddress: cfg.AdvancerTelemetryAddress,
132132
Factories: factories,
133133
}
134-
sup := service.NewSupervisor(supCfg)
134+
sup, err := service.NewSupervisor(ctx, supCfg)
135+
cli.CheckErr(logger, err)
135136
defer sup.Close()
136-
cli.CheckErr(logger, sup.Serve(ctx))
137+
cli.CheckErr(logger, sup.Serve())
137138
}

cmd/cartesi-rollups-claimer/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ func run(cmd *cobra.Command, args []string) {
101101
},
102102
},
103103
}
104-
sup := service.NewSupervisor(supCfg)
104+
sup, err := service.NewSupervisor(ctx, supCfg)
105+
cli.CheckErr(logger, err)
105106
defer sup.Close()
106-
cli.CheckErr(logger, sup.Serve(ctx))
107+
cli.CheckErr(logger, sup.Serve())
107108
}

cmd/cartesi-rollups-evm-reader/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ func run(cmd *cobra.Command, args []string) {
101101
},
102102
},
103103
}
104-
sup := service.NewSupervisor(supCfg)
104+
sup, err := service.NewSupervisor(ctx, supCfg)
105+
cli.CheckErr(logger, err)
105106
defer sup.Close()
106-
cli.CheckErr(logger, sup.Serve(ctx))
107+
cli.CheckErr(logger, sup.Serve())
107108
}

cmd/cartesi-rollups-jsonrpc-api/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ func run(cmd *cobra.Command, args []string) {
8989
},
9090
},
9191
}
92-
sup := service.NewSupervisor(supCfg)
92+
sup, err := service.NewSupervisor(ctx, supCfg)
93+
cli.CheckErr(logger, err)
9394
defer sup.Close()
94-
cli.CheckErr(logger, sup.Serve(ctx))
95+
cli.CheckErr(logger, sup.Serve())
9596
}

cmd/cartesi-rollups-node/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ func run(cmd *cobra.Command, args []string) {
228228
TelemetryAddress: cfg.NodeTelemetryAddress,
229229
Factories: factories,
230230
}
231-
sup := service.NewSupervisor(supCfg)
231+
sup, err := service.NewSupervisor(ctx, supCfg)
232+
cli.CheckErr(logger, err)
232233
defer sup.Close()
233-
cli.CheckErr(logger, sup.Serve(ctx))
234+
cli.CheckErr(logger, sup.Serve())
234235
}

cmd/cartesi-rollups-prt/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ func run(cmd *cobra.Command, args []string) {
8989
},
9090
},
9191
}
92-
sup := service.NewSupervisor(supCfg)
92+
sup, err := service.NewSupervisor(ctx, supCfg)
93+
cli.CheckErr(logger, err)
9394
defer sup.Close()
94-
cli.CheckErr(logger, sup.Serve(ctx))
95+
cli.CheckErr(logger, sup.Serve())
9596
}

cmd/cartesi-rollups-validator/root/root.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ func run(cmd *cobra.Command, args []string) {
8989
},
9090
},
9191
}
92-
sup := service.NewSupervisor(supCfg)
92+
sup, err := service.NewSupervisor(ctx, supCfg)
93+
cli.CheckErr(logger, err)
9394
defer sup.Close()
94-
cli.CheckErr(logger, sup.Serve(ctx))
95+
cli.CheckErr(logger, sup.Serve())
9596
}

internal/advancer/advancer_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ func newMockAdvancerServiceWithBatchSize(
4646
repo *MockRepository,
4747
batchSize uint64,
4848
) (*Service, error) {
49+
sup, err := service.NewSupervisor(context.Background(), &service.SupervisorConfigs{})
4950
s := &Service{
5051
inputBatchSize: batchSize,
5152
machineManager: machineManager,
5253
repository: repo,
53-
supervisor: service.NewSupervisor(&service.SupervisorConfigs{}),
54+
supervisor: sup,
5455
}
55-
err := service.InitTickServiceTemplate(&s.TickServiceTemplate, &service.TickServiceConfigs{}, s)
56+
err = service.InitTickServiceTemplate(&s.TickServiceTemplate, &service.TickServiceConfigs{}, s)
5657
if err != nil {
5758
return nil, err
5859
}

internal/evmreader/edge_cases_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ func (s *EvmReaderSuite) TestAdapterCacheInvalidationOnConfigChange() {
515515

516516
done := make(chan struct{})
517517
go func() {
518-
err := s.supervisor.Serve(s.ctx)
518+
err := s.supervisor.Serve()
519519
s.Require().NoError(err)
520520
close(done)
521521
}()

internal/evmreader/evmreader_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ func (s *EvmReaderSuite) SetupTest() {
8181
},
8282
},
8383
}
84-
s.supervisor = service.NewSupervisor(&supCfg)
84+
sup, err := service.NewSupervisor(s.ctx, &supCfg)
8585
s.Require().NoError(err)
86+
s.supervisor = sup
8687
}
8788

8889
func (s *EvmReaderSuite) TearDownTest() {
@@ -313,7 +314,7 @@ func (s *EvmReaderSuite) TestItRunsWhenConnectionFails() {
313314

314315
done := make(chan struct{})
315316
go func() {
316-
err := s.supervisor.Serve(s.T().Context())
317+
err := s.supervisor.Serve()
317318
s.Require().NoError(err)
318319
close(done)
319320
}()
@@ -334,7 +335,7 @@ func (s *EvmReaderSuite) TestRunResetsRetriesAfterProcessingHeaders() {
334335

335336
done := make(chan struct{})
336337
go func() {
337-
err := s.supervisor.Serve(s.T().Context())
338+
err := s.supervisor.Serve()
338339
s.Require().NoError(err)
339340
close(done)
340341
}()

0 commit comments

Comments
 (0)