integrate with pruner

celestiaorg · Apr 1, 2024 · 09e93d7 · 09e93d7
1 parent 6394d37
commit 09e93d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/nodebuilder/pruner/module.go b/nodebuilder/pruner/module.go
@@ -2,6 +2,7 @@ package pruner
 
 import (
 	"context"
+	"github.com/celestiaorg/celestia-node/share/store"
 
 	"go.uber.org/fx"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/celestiaorg/celestia-node/pruner/archival"
 	"github.com/celestiaorg/celestia-node/pruner/full"
 	"github.com/celestiaorg/celestia-node/pruner/light"
-	"github.com/celestiaorg/celestia-node/share/eds"
 )
 
 func ConstructModule(tp node.Type, cfg *Config) fx.Option {
@@ -46,15 +46,15 @@ func ConstructModule(tp node.Type, cfg *Config) fx.Option {
 	case node.Full:
 		return fx.Module("prune",
 			baseComponents,
-			fx.Provide(func(store *eds.Store) pruner.Pruner {
+			fx.Provide(func(store *store.Store) pruner.Pruner {
 				return full.NewPruner(store)
 			}),
 			fx.Supply(full.Window),
 		)
 	case node.Bridge:
 		return fx.Module("prune",
 			baseComponents,
-			fx.Provide(func(store *eds.Store) pruner.Pruner {
+			fx.Provide(func(store *store.Store) pruner.Pruner {
 				return full.NewPruner(store)
 			}),
 			fx.Supply(full.Window),

diff --git a/nodebuilder/share/module.go b/nodebuilder/share/module.go
@@ -84,7 +84,6 @@ func ConstructModule(tp node.Type, cfg *Config, options ...fx.Option) fx.Option
 			baseComponents,
 			shrexGetterComponents(cfg),
 			lightAvailabilityComponents(cfg),
-			fx.Invoke(ensureEmptyEDSInBS),
 			fx.Provide(shwap_getter.NewGetter),
 			fx.Provide(shwap_getter.NewReconstructionGetter),
 			fx.Provide(lightGetter),

diff --git a/pruner/full/pruner.go b/pruner/full/pruner.go
@@ -3,22 +3,22 @@ package full
 import (
 	"context"
 	"errors"
+	"github.com/celestiaorg/celestia-node/share/store"
 
 	"github.com/filecoin-project/dagstore"
 	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/share"
-	"github.com/celestiaorg/celestia-node/share/eds"
 )
 
 var log = logging.Logger("pruner/full")
 
 type Pruner struct {
-	store *eds.Store
+	store *store.Store
 }
 
-func NewPruner(store *eds.Store) *Pruner {
+func NewPruner(store *store.Store) *Pruner {
 	return &Pruner{
 		store: store,
 	}
@@ -32,7 +32,7 @@ func (p *Pruner) Prune(ctx context.Context, eh *header.ExtendedHeader) error {
 
 	log.Debugf("pruning header %s", eh.DAH.Hash())
 
-	err := p.store.Remove(ctx, eh.DAH.Hash())
+	err := p.store.Remove(ctx, eh.Height())
 	if err != nil && !errors.Is(err, dagstore.ErrShardUnknown) {
 		return err
 	}