refactor: cosmetic changes

celestiaorg · Aug 21, 2023 · 2d64795 · 2d64795
1 parent 1b24356
commit 2d64795
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/nodebuilder/core/config.go b/nodebuilder/core/config.go
@@ -26,7 +26,7 @@ func DefaultConfig() Config {
 
 // Validate performs basic validation of the config.
 func (cfg *Config) Validate() error {
-	if !cfg.EndpointConfigured() {
+	if !cfg.IsEndpointConfigured() {
 		return nil
 	}
 
@@ -46,8 +46,8 @@ func (cfg *Config) Validate() error {
 	return nil
 }
 
-// EndpointConfigured returns whether a core endpoint has been set
+// IsEndpointConfigured returns whether a core endpoint has been set
 // on the config (true if set).
-func (cfg *Config) EndpointConfigured() bool {
+func (cfg *Config) IsEndpointConfigured() bool {
 	return cfg.IP != ""
 }
diff --git a/nodebuilder/module.go b/nodebuilder/module.go
@@ -45,7 +45,7 @@ func ConstructModule(tp node.Type, network p2p.Network, cfg *Config, store Store
 		fx.Supply(signer),
 		// modules provided by the node
 		p2p.ConstructModule(tp, &cfg.P2P),
-		state.ConstructModule(tp, &cfg.State),
+		state.ConstructModule(tp, &cfg.State, &cfg.Core),
 		header.ConstructModule(tp, &cfg.Header),
 		share.ConstructModule(tp, &cfg.Share),
 		rpc.ConstructModule(tp, &cfg.RPC),

diff --git a/nodebuilder/state/core.go b/nodebuilder/state/core.go
@@ -20,11 +20,6 @@ func coreAccessor(
 	sync *sync.Syncer[*header.ExtendedHeader],
 	fraudServ libfraud.Service,
 ) (*state.CoreAccessor, Module, *modfraud.ServiceBreaker[*state.CoreAccessor]) {
-	if !corecfg.EndpointConfigured() {
-		log.Info("No core endpoint provided, running node without state access")
-		return nil, &stubbedStateModule{}, nil
-	}
-
 	ca := state.NewCoreAccessor(signer, sync, corecfg.IP, corecfg.RPCPort, corecfg.GRPCPort)
 
 	return ca, ca, &modfraud.ServiceBreaker[*state.CoreAccessor]{

diff --git a/nodebuilder/state/module.go b/nodebuilder/state/module.go
@@ -6,6 +6,8 @@ import (
 	logging "github.com/ipfs/go-log/v2"
 	"go.uber.org/fx"
 
+	"github.com/celestiaorg/celestia-node/libs/fxutil"
+	"github.com/celestiaorg/celestia-node/nodebuilder/core"
 	modfraud "github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	"github.com/celestiaorg/celestia-node/nodebuilder/node"
 	"github.com/celestiaorg/celestia-node/state"
@@ -15,14 +17,14 @@ var log = logging.Logger("module/state")
 
 // ConstructModule provides all components necessary to construct the
 // state service.
-func ConstructModule(tp node.Type, cfg *Config) fx.Option {
+func ConstructModule(tp node.Type, cfg *Config, coreCfg *core.Config) fx.Option {
 	// sanitize config values before constructing module
 	cfgErr := cfg.Validate()
 
 	baseComponents := fx.Options(
 		fx.Supply(*cfg),
 		fx.Error(cfgErr),
-		fx.Provide(fx.Annotate(
+		fxutil.ProvideIf(coreCfg.IsEndpointConfigured(), fx.Annotate(
 			coreAccessor,
 			fx.OnStart(func(ctx context.Context, breaker *modfraud.ServiceBreaker[*state.CoreAccessor]) error {
 				return breaker.Start(ctx)
@@ -31,6 +33,9 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
 				return breaker.Stop(ctx)
 			}),
 		)),
+		fxutil.ProvideIf(!coreCfg.IsEndpointConfigured(), func() (*state.CoreAccessor, Module) {
+			return nil, &stubbedStateModule{}
+		}),
 	)
 
 	switch tp {