chore: cleanup

celestiaorg · May 8, 2024 · 1684a62 · 1684a62
1 parent bd73a9c
commit 1684a62
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 33 deletions.
diff --git a/nodebuilder/pruner/module.go b/nodebuilder/pruner/module.go
@@ -20,36 +20,7 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
 	)
 
 	if !cfg.EnableService {
-		switch tp {
-		case node.Light:
-			// light nodes are still subject to sampling within window
-			// even if pruning is not enabled.
-			return fx.Options(
-				baseComponents,
-				fx.Provide(func() pruner.AvailabilityWindow {
-					return light.Window
-				}),
-			)
-		case node.Full:
-			return fx.Options(
-				baseComponents,
-				fx.Provide(func() pruner.AvailabilityWindow {
-					return archival.Window
-				}),
-			)
-		case node.Bridge:
-			return fx.Options(
-				baseComponents,
-				fx.Provide(func() pruner.AvailabilityWindow {
-					return archival.Window
-				}),
-				fx.Provide(func() []core.Option {
-					return []core.Option{}
-				}),
-			)
-		default:
-			panic("unknown node type")
-		}
+		return disabledPrunerComponents(tp, baseComponents)
 	}
 
 	baseComponents = fx.Options(
@@ -104,3 +75,36 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
 		panic("unknown node type")
 	}
 }
+
+func disabledPrunerComponents(tp node.Type, baseComponents fx.Option) fx.Option {
+	switch tp {
+	case node.Light:
+		// light nodes are still subject to sampling within window
+		// even if pruning is not enabled.
+		return fx.Options(
+			baseComponents,
+			fx.Provide(func() pruner.AvailabilityWindow {
+				return light.Window
+			}),
+		)
+	case node.Full:
+		return fx.Options(
+			baseComponents,
+			fx.Provide(func() pruner.AvailabilityWindow {
+				return archival.Window
+			}),
+		)
+	case node.Bridge:
+		return fx.Options(
+			baseComponents,
+			fx.Provide(func() pruner.AvailabilityWindow {
+				return archival.Window
+			}),
+			fx.Provide(func() []core.Option {
+				return []core.Option{}
+			}),
+		)
+	default:
+		panic("unknown node type")
+	}
+}
diff --git a/nodebuilder/share/module.go b/nodebuilder/share/module.go
@@ -3,7 +3,6 @@ package share
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/ipfs/go-datastore"
 	"github.com/libp2p/go-libp2p/core/host"
@@ -188,15 +187,13 @@ func shrexGetterComponents(cfg *Config) fx.Option {
 		// shrex-getter
 		fx.Provide(fx.Annotate(
 			func(
-				tp node.Type,
 				edsClient *shrexeds.Client,
 				ndClient *shrexnd.Client,
 				man *peers.Manager,
 				window pruner.AvailabilityWindow,
 				opts []getters.Option,
 			) *getters.ShrexGetter {
 				opts = append(opts, getters.WithAvailabilityWindow(window))
-				fmt.Println("\n\n CONSTRUCTING SHREX GETTER WITH WINDOW: ", time.Duration(window).String(), "TYPE: ", tp.String())
 				return getters.NewShrexGetter(edsClient, ndClient, man, opts...)
 			},
 			fx.OnStart(func(ctx context.Context, getter *getters.ShrexGetter) error {

diff --git a/nodebuilder/tests/swamp/swamp.go b/nodebuilder/tests/swamp/swamp.go
@@ -27,6 +27,7 @@ import (
 	"github.com/celestiaorg/celestia-node/core"
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/libs/keystore"
+	"github.com/celestiaorg/celestia-node/logs"
 	"github.com/celestiaorg/celestia-node/nodebuilder"
 	coremodule "github.com/celestiaorg/celestia-node/nodebuilder/core"
 	"github.com/celestiaorg/celestia-node/nodebuilder/node"
@@ -64,6 +65,9 @@ type Swamp struct {
 
 // NewSwamp creates a new instance of Swamp.
 func NewSwamp(t *testing.T, options ...Option) *Swamp {
+	if testing.Verbose() {
+		logs.SetDebugLogging()
+	}
 
 	ic := DefaultConfig()
 	for _, option := range options {