fix(nodebuilder/pruner): move pruner provide back to pruner pkg to av…

…oid cyclical import
celestiaorg · Nov 1, 2024 · fa7ba77 · fa7ba77
1 parent 06179a2
commit fa7ba77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/nodebuilder/pruner/module.go b/nodebuilder/pruner/module.go
@@ -13,8 +13,8 @@ import (
 	"github.com/celestiaorg/celestia-node/nodebuilder/node"
 	"github.com/celestiaorg/celestia-node/pruner"
 	"github.com/celestiaorg/celestia-node/pruner/full"
-	"github.com/celestiaorg/celestia-node/pruner/light"
 	"github.com/celestiaorg/celestia-node/share/availability"
+	"github.com/celestiaorg/celestia-node/share/availability/light"
 )
 
 var log = logging.Logger("module/pruner")
@@ -45,7 +45,9 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
 		if cfg.EnableService {
 			return fx.Module("prune",
 				baseComponents,
-				prunerService,
+				// TODO(@walldiss @renaynay): remove conversion after Availability and Pruner interfaces are merged
+				//  note this provide exists in pruner module to avoid cyclical imports
+				fx.Provide(func(la *light.ShareAvailability) pruner.Pruner { return la }),
 			)
 		}
 		// We do not trigger DetectPreviousRun for Light nodes, to allow them to disable pruning at wish.

diff --git a/nodebuilder/share/module.go b/nodebuilder/share/module.go
@@ -232,7 +232,6 @@ func availabilityComponents(tp node.Type, cfg *Config) fx.Option {
 				},
 				fx.As(fx.Self()),
 				fx.As(new(share.Availability)),
-				fx.As(new(pruner.Pruner)), // TODO(@walldiss): remove conversion after Availability and Pruner interfaces are merged
 				fx.OnStop(func(ctx context.Context, la *light.ShareAvailability) error {
 					return la.Close(ctx)
 				}),