fixup! refactor(services): expose only lifecycle interface of service's Go objects

Author: renatomaia

internal/advancer/service.go

@@ -96,7 +96,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 // Service interface implementation

internal/claimer/service.go

@@ -114,7 +114,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 func (s *Service) Alive() bool {

internal/evmreader/service.go

@@ -129,7 +129,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 func (s *Service) Alive() bool {

internal/jsonrpc/service.go

@@ -89,7 +89,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 func (s *Service) Alive() bool {

internal/jsonrpc/util_test.go

@@ -96,7 +96,7 @@ func newTestService(t *testing.T, name string) *Service {
 	s, err := Create(ctx, &ci)
 	require.NoError(t, err, "on new test service")
 
-	return s.(*Service)
+	return s.(*service.Service).Impl.(*Service)
 }
 
 func nameToNumber(in string) uint64 {

internal/node/node.go

@@ -70,7 +70,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 type serviceCreator func(context.Context, *CreateInfo, *Service) (service.IService, error)

internal/prt/service.go

@@ -120,7 +120,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 func (s *Service) Alive() bool     { return true }

internal/validator/validator.go

@@ -62,7 +62,7 @@ func Create(ctx context.Context, c *CreateInfo) (service.IService, error) {
 
 	s.LogConfig(c.Config)
 
-	return s, nil
+	return &s.Service, nil
 }
 
 func (s *Service) Alive() bool     { return true }

test/validator/validator_test.go

@@ -65,7 +65,7 @@ func (s *ValidatorRepositoryIntegrationSuite) SetupSubTest() {
 		Repository: s.repository,
 	}
 	srv, err := validator.Create(context.Background(), &serviceArgs)
-	s.validator = srv.(*validator.Service)
+	s.validator = srv.(*service.Service).Impl.(*validator.Service)
 	s.Require().Nil(err)
 }