nit

Author: pthmas

pkg/store/store_adapter.go

@@ -151,9 +151,9 @@ type StoreAdapter[H EntityWithDAHint[H]] struct {
 	onDeleteFn func(context.Context, uint64) error
 }
 
-// NewStoreAdapter creates a new StoreAdapter wrapping the given store getter.
+// NewStoreAdapter creates a new StoreAdapter wrapping the given store getter and backing Store.
 // The genesis is used to determine the initial height for efficient Tail lookups.
-func NewStoreAdapter[H EntityWithDAHint[H]](getter StoreGetter[H], gen genesis.Genesis) *StoreAdapter[H] {
+func NewStoreAdapter[H EntityWithDAHint[H]](getter StoreGetter[H], store Store, gen genesis.Genesis) *StoreAdapter[H] {
 	// Create LRU cache for pending items - ignore error as size is constant and valid
 	pendingCache, _ := lru.New[uint64, H](defaultPendingCacheSize)
 	daHintsCache, _ := lru.New[uint64, uint64](defaultPendingCacheSize)
@@ -166,6 +166,7 @@ func NewStoreAdapter[H EntityWithDAHint[H]](getter StoreGetter[H], gen genesis.G
 
 	adapter := &StoreAdapter[H]{
 		getter:               getter,
+		store:                store,
 		genesisInitialHeight: max(gen.InitialHeight, 1),
 		pending:              pendingCache,
 		daHints:              daHintsCache,
@@ -252,7 +253,6 @@ func (a *StoreAdapter[H]) Head(ctx context.Context, _ ...header.HeadOption[H]) (
 // Tail returns the lowest item in the store.
 // For ev-node, this is typically the genesis/initial height.
 // If pruning has occurred, it walks up from initialHeight to find the first available item.
-// TODO(@julienrbrt): Optimize this when pruning is enabled.
 func (a *StoreAdapter[H]) Tail(ctx context.Context) (H, error) {
 	var zero H
 
@@ -270,12 +270,10 @@ func (a *StoreAdapter[H]) Tail(ctx context.Context) (H, error) {
 	// genesis initial height, but if pruning metadata is available we can
 	// skip directly past fully-pruned ranges.
 	startHeight := a.genesisInitialHeight
-	if a.store != nil {
-		if meta, err := a.store.GetMetadata(ctx, LastPrunedBlockHeightKey); err == nil && len(meta) == heightLength {
-			if lastPruned, err := decodeHeight(meta); err == nil {
-				if candidate := lastPruned + 1; candidate > startHeight {
-					startHeight = candidate
-				}
+	if meta, err := a.store.GetMetadata(ctx, LastPrunedBlockHeightKey); err == nil && len(meta) == heightLength {
+		if lastPruned, err := decodeHeight(meta); err == nil {
+			if candidate := lastPruned + 1; candidate > startHeight {
+				startHeight = candidate
 			}
 		}
 	}
@@ -732,15 +730,11 @@ type DataStoreAdapter = StoreAdapter[*types.P2PData]
 // NewHeaderStoreAdapter creates a new StoreAdapter for headers.
 // The genesis is used to determine the initial height for efficient Tail lookups.
 func NewHeaderStoreAdapter(store Store, gen genesis.Genesis) *HeaderStoreAdapter {
-	adapter := NewStoreAdapter(NewHeaderStoreGetter(store), gen)
-	adapter.store = store
-	return adapter
+	return NewStoreAdapter(NewHeaderStoreGetter(store), store, gen)
 }
 
 // NewDataStoreAdapter creates a new StoreAdapter for data.
 // The genesis is used to determine the initial height for efficient Tail lookups.
 func NewDataStoreAdapter(store Store, gen genesis.Genesis) *DataStoreAdapter {
-	adapter := NewStoreAdapter(NewDataStoreGetter(store), gen)
-	adapter.store = store
-	return adapter
+	return NewStoreAdapter(NewDataStoreGetter(store), store, gen)
 }