chore!: refactor ServiceFn and pass runner

The service function is renamed and
in addition to the context also receives the Runner instance

Author: ezdac

rolling-shutter/chainobserver/observer.go

@@ -79,7 +79,7 @@ func (c *ChainObserver) Start(ctx context.Context, runner service.Runner) error
 	log.Info().Uint64("from-block", fromBlock).Uint64("from-log-index", fromLogIndex).
 		Msg("starting event syncing")
 	syncer := eventsyncer.New(c.Client, finalityOffset, eventTypes, fromBlock, fromLogIndex)
-	handleSyncLoop := func(ctx context.Context) error {
+	handleSyncLoop := func(ctx context.Context, _ service.Runner) error {
 		for {
 			select {
 			case <-ctx.Done():
@@ -102,5 +102,5 @@ func (c *ChainObserver) Start(ctx context.Context, runner service.Runner) error
 			}
 		}
 	}
-	return runner.StartService(syncer, service.ServiceFn{Fn: handleSyncLoop})
+	return runner.StartService(syncer, service.Function{Func: handleSyncLoop})
 }

rolling-shutter/keyper/keyper.go

@@ -166,7 +166,7 @@ func (kpr *KeyperCore) Start(ctx context.Context, runner service.Runner) error {
 func (kpr *KeyperCore) getServices() []service.Service {
 	services := []service.Service{
 		kpr.messaging,
-		service.ServiceFn{Fn: kpr.operateShuttermint},
+		service.Function{Func: kpr.operateShuttermint},
 		newEonPubKeyHandler(kpr),
 	}
 	keyTrigger := kpr.trigger
@@ -334,7 +334,7 @@ func (kpr *KeyperCore) handleOnChainKeyperSetChanges(
 
 // TODO: we need a better block syncing mechanism!
 // Also this is doing too much work sequentially in one routine.
-func (kpr *KeyperCore) operateShuttermint(ctx context.Context) error {
+func (kpr *KeyperCore) operateShuttermint(ctx context.Context, _ service.Runner) error {
 	for {
 		syncBlockNumber, err := retry.FunctionCall(ctx, kpr.blockSyncClient.BlockNumber)
 		if err != nil {

rolling-shutter/medley/channel/fanin_test.go

@@ -36,8 +36,8 @@ func TestFanIn(t *testing.T) {
 		end := end
 		step := numFns
 		channels = append(channels, ch)
-		fnService := service.ServiceFn{
-			Fn: func(ctx context.Context) error {
+		fnService := service.Function{
+			Func: func(ctx context.Context, _ service.Runner) error {
 				putInts(ctx, ch, start, end, step)
 				return nil
 			},
@@ -48,8 +48,8 @@ func TestFanIn(t *testing.T) {
 	services = append(services, fanIn)
 
 	result := []int{}
-	fanConsumer := service.ServiceFn{
-		Fn: func(ctx context.Context) error {
+	fanConsumer := service.Function{
+		Func: func(ctx context.Context, _ service.Runner) error {
 			for val := range fanIn.C {
 				result = append(result, val)
 			}

rolling-shutter/medley/service/service.go

@@ -121,13 +121,13 @@ func RunWithSighandler(ctx context.Context, services ...Service) error {
 	return err
 }
 
-type ServiceFn struct {
-	Fn func(ctx context.Context) error
+type Function struct {
+	Func func(ctx context.Context, group Runner) error
 }
 
-func (sf ServiceFn) Start(ctx context.Context, group Runner) error { //nolint:unparam
+func (sf Function) Start(ctx context.Context, group Runner) error { //nolint:unparam
 	group.Go(func() error {
-		return sf.Fn(ctx)
+		return sf.Func(ctx, group)
 	})
 	return nil
 }