clean-up

Author: julienrbrt

pkg/store/data_store_adapter.go

@@ -400,35 +400,3 @@ func (a *DataStoreAdapter) DeleteRange(ctx context.Context, from, to uint64) err
 func (a *DataStoreAdapter) OnDelete(fn func(context.Context, uint64) error) {
 	a.onDeleteFn = fn
 }
-
-// RefreshHeight updates the cached height from the underlying store.
-// This should be called after the syncer processes a new block.
-func (a *DataStoreAdapter) RefreshHeight(ctx context.Context) error {
-	h, err := a.store.Height(ctx)
-	if err != nil {
-		return err
-	}
-	a.height.Store(h)
-
-	// Clean up pending data that is now in store
-	for _, height := range a.pendingData.Keys() {
-		if height <= h {
-			a.pendingData.Remove(height)
-		}
-	}
-
-	return nil
-}
-
-// SetHeight updates the cached height.
-// This is useful when the syncer knows the new height after processing a block.
-func (a *DataStoreAdapter) SetHeight(height uint64) {
-	a.height.Store(height)
-
-	// Clean up pending data at or below this height
-	for _, h := range a.pendingData.Keys() {
-		if h <= height {
-			a.pendingData.Remove(h)
-		}
-	}
-}

pkg/store/data_store_adapter_test.go

@@ -380,51 +380,6 @@ func TestDataStoreAdapter_OnDelete(t *testing.T) {
 	assert.Equal(t, []uint64{1, 2}, deletedHeights)
 }
 
-func TestDataStoreAdapter_RefreshHeight(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
-
-	ds, err := NewTestInMemoryKVStore()
-	require.NoError(t, err)
-	store := New(ds)
-	adapter := NewDataStoreAdapter(store)
-
-	// Save a block directly to the underlying store
-	h1, d1 := types.GetRandomBlock(1, 1, "test-chain")
-	batch, err := store.NewBatch(ctx)
-	require.NoError(t, err)
-	require.NoError(t, batch.SaveBlockData(h1, d1, &types.Signature{}))
-	require.NoError(t, batch.SetHeight(1))
-	require.NoError(t, batch.Commit())
-
-	// RefreshHeight should update from store and clean pending
-	err = adapter.RefreshHeight(ctx)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(1), adapter.Height())
-}
-
-func TestDataStoreAdapter_SetHeight(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
-
-	ds, err := NewTestInMemoryKVStore()
-	require.NoError(t, err)
-	store := New(ds)
-	adapter := NewDataStoreAdapter(store)
-
-	// Add some pending data
-	_, d1 := types.GetRandomBlock(1, 1, "test-chain")
-	_, d2 := types.GetRandomBlock(2, 1, "test-chain")
-	require.NoError(t, adapter.Append(ctx, d1, d2))
-
-	// SetHeight should update height and clean pending at or below
-	adapter.SetHeight(1)
-	assert.Equal(t, uint64(1), adapter.Height())
-
-	// Height 2 should still be in pending
-	assert.True(t, adapter.HasAt(ctx, 2))
-}
-
 func TestDataStoreAdapter_AppendSkipsExisting(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()

pkg/store/header_store_adapter.go

@@ -12,11 +12,8 @@ import (
 	"github.com/evstack/ev-node/types"
 )
 
-const (
-	// defaultPendingCacheSize is the default size for the pending headers/data LRU cache.
-	// This should be large enough to handle P2P sync bursts but bounded to prevent memory issues.
-	defaultPendingCacheSize = 1000
-)
+// defaultPendingCacheSize is the default size for the pending headers/data LRU cache.
+const defaultPendingCacheSize = 1000
 
 // HeaderStoreAdapter wraps Store to implement header.Store[*types.SignedHeader].
 // This allows the ev-node store to be used directly by go-header's P2P infrastructure,
@@ -407,38 +404,6 @@ func (a *HeaderStoreAdapter) OnDelete(fn func(context.Context, uint64) error) {
 	a.onDeleteFn = fn
 }
 
-// RefreshHeight updates the cached height from the underlying store.
-// This should be called after the syncer processes a new block.
-func (a *HeaderStoreAdapter) RefreshHeight(ctx context.Context) error {
-	h, err := a.store.Height(ctx)
-	if err != nil {
-		return err
-	}
-	a.height.Store(h)
-
-	// Clean up pending headers that are now in store
-	for _, height := range a.pendingHeaders.Keys() {
-		if height <= h {
-			a.pendingHeaders.Remove(height)
-		}
-	}
-
-	return nil
-}
-
-// SetHeight updates the cached height.
-// This is useful when the syncer knows the new height after processing a block.
-func (a *HeaderStoreAdapter) SetHeight(height uint64) {
-	a.height.Store(height)
-
-	// Clean up pending headers at or below this height
-	for _, h := range a.pendingHeaders.Keys() {
-		if h <= height {
-			a.pendingHeaders.Remove(h)
-		}
-	}
-}
-
 // bytesEqual compares two byte slices for equality.
 func bytesEqual(a, b []byte) bool {
 	if len(a) != len(b) {

pkg/store/header_store_adapter_test.go

@@ -379,53 +379,6 @@ func TestHeaderStoreAdapter_OnDelete(t *testing.T) {
 	assert.Equal(t, []uint64{1, 2}, deletedHeights)
 }
 
-func TestHeaderStoreAdapter_RefreshHeight(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
-
-	ds, err := NewTestInMemoryKVStore()
-	require.NoError(t, err)
-	store := New(ds)
-	adapter := NewHeaderStoreAdapter(store)
-
-	// Save a block directly to the underlying store
-	h1, d1 := types.GetRandomBlock(1, 1, "test-chain")
-	batch, err := store.NewBatch(ctx)
-	require.NoError(t, err)
-	require.NoError(t, batch.SaveBlockData(h1, d1, &types.Signature{}))
-	require.NoError(t, batch.SetHeight(1))
-	require.NoError(t, batch.Commit())
-
-	// RefreshHeight should update from store and clean pending
-	err = adapter.RefreshHeight(ctx)
-	require.NoError(t, err)
-	assert.Equal(t, uint64(1), adapter.Height())
-}
-
-func TestHeaderStoreAdapter_SetHeight(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
-
-	ds, err := NewTestInMemoryKVStore()
-	require.NoError(t, err)
-	store := New(ds)
-	adapter := NewHeaderStoreAdapter(store)
-
-	// Add some pending headers
-	h1, _ := types.GetRandomBlock(1, 1, "test-chain")
-	h2, _ := types.GetRandomBlock(2, 1, "test-chain")
-	require.NoError(t, adapter.Append(ctx, h1, h2))
-
-	// SetHeight should update height and clean pending at or below
-	adapter.SetHeight(1)
-	assert.Equal(t, uint64(1), adapter.Height())
-
-	// Height 1 should be cleaned from pending
-	// (but since we don't have store data, HasAt returns false now for pending)
-	// Height 2 should still be in pending
-	assert.True(t, adapter.HasAt(ctx, 2))
-}
-
 func TestHeaderStoreAdapter_AppendSkipsExisting(t *testing.T) {
 	t.Parallel()
 	ctx := context.Background()

pkg/sync/sync_service.go

@@ -189,8 +189,6 @@ func (syncService *SyncService[H]) Store() header.Store[H] {
 }
 
 // WriteToStoreAndBroadcast broadcasts provided header or block to P2P network.
-// Note: With the store adapter approach, actual storage is handled by the syncer
-// writing to the ev-node store. This method primarily handles P2P broadcasting.
 func (syncService *SyncService[H]) WriteToStoreAndBroadcast(ctx context.Context, headerOrData H, opts ...pubsub.PubOpt) error {
 	if syncService.genesis.InitialHeight == 0 {
 		return fmt.Errorf("invalid initial height; cannot be zero")