split manager in two

Author: julienrbrt

block/internal/cache/manager.go

@@ -41,8 +41,8 @@ func registerGobTypes() {
 	})
 }
 
-// Manager provides centralized cache management for both executing and syncing components
-type Manager interface {
+// CacheManager provides centralized cache management for both executing and syncing components
+type CacheManager interface {
 	// Header operations
 	IsHeaderSeen(hash string) bool
 	SetHeaderSeen(hash string, blockHeight uint64)
@@ -61,14 +61,6 @@ type Manager interface {
 	SetTxSeen(hash string)
 	CleanupOldTxs(olderThan time.Duration) int
 
-	// Pending operations
-	GetPendingHeaders(ctx context.Context) ([]*types.SignedHeader, error)
-	GetPendingData(ctx context.Context) ([]*types.SignedData, error)
-	SetLastSubmittedHeaderHeight(ctx context.Context, height uint64)
-	SetLastSubmittedDataHeight(ctx context.Context, height uint64)
-	NumPendingHeaders() uint64
-	NumPendingData() uint64
-
 	// Pending events syncing coordination
 	GetNextPendingEvent(blockHeight uint64) *common.DAHeightEvent
 	SetPendingEvent(blockHeight uint64, event *common.DAHeightEvent)
@@ -82,6 +74,22 @@ type Manager interface {
 	DeleteHeight(blockHeight uint64)
 }
 
+// PendingManager provides operations for managing pending headers and data
+type PendingManager interface {
+	GetPendingHeaders(ctx context.Context) ([]*types.SignedHeader, error)
+	GetPendingData(ctx context.Context) ([]*types.SignedData, error)
+	SetLastSubmittedHeaderHeight(ctx context.Context, height uint64)
+	SetLastSubmittedDataHeight(ctx context.Context, height uint64)
+	NumPendingHeaders() uint64
+	NumPendingData() uint64
+}
+
+// Manager provides centralized cache management for both executing and syncing components
+type Manager interface {
+	CacheManager
+	PendingManager
+}
+
 var _ Manager = (*implementation)(nil)
 
 // implementation provides the concrete implementation of cache Manager
@@ -97,6 +105,59 @@ type implementation struct {
 	logger             zerolog.Logger
 }
 
+// NewPendingManager creates a new pending manager instance
+func NewPendingManager(store store.Store, logger zerolog.Logger) (PendingManager, error) {
+	pendingHeaders, err := NewPendingHeaders(store, logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create pending headers: %w", err)
+	}
+
+	pendingData, err := NewPendingData(store, logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create pending data: %w", err)
+	}
+
+	return &implementation{
+		pendingHeaders: pendingHeaders,
+		pendingData:    pendingData,
+		logger:         logger,
+	}, nil
+}
+
+// NewCacheManager creates a new cache manager instance
+func NewCacheManager(cfg config.Config, logger zerolog.Logger) (CacheManager, error) {
+	// Initialize caches
+	headerCache := NewCache[types.SignedHeader]()
+	dataCache := NewCache[types.Data]()
+	txCache := NewCache[struct{}]()
+	pendingEventsCache := NewCache[common.DAHeightEvent]()
+
+	registerGobTypes()
+	impl := &implementation{
+		headerCache:        headerCache,
+		dataCache:          dataCache,
+		txCache:            txCache,
+		txTimestamps:       new(sync.Map),
+		pendingEventsCache: pendingEventsCache,
+		config:             cfg,
+		logger:             logger,
+	}
+
+	if cfg.ClearCache {
+		// Clear the cache from disk
+		if err := impl.ClearFromDisk(); err != nil {
+			logger.Warn().Err(err).Msg("failed to clear cache from disk, starting with empty cache")
+		}
+	} else {
+		// Load existing cache from disk
+		if err := impl.LoadFromDisk(); err != nil {
+			logger.Warn().Err(err).Msg("failed to load cache from disk, starting with empty cache")
+		}
+	}
+
+	return impl, nil
+}
+
 // NewManager creates a new cache manager instance
 func NewManager(cfg config.Config, store store.Store, logger zerolog.Logger) (Manager, error) {
 	// Initialize caches

block/internal/reaping/reaper.go

@@ -34,7 +34,7 @@ type Reaper struct {
 	sequencer coresequencer.Sequencer
 	chainID   string
 	interval  time.Duration
-	cache     cache.Manager
+	cache     cache.CacheManager
 	executor  *executing.Executor
 
 	// shared components
@@ -53,7 +53,7 @@ func NewReaper(
 	genesis genesis.Genesis,
 	logger zerolog.Logger,
 	executor *executing.Executor,
-	cache cache.Manager,
+	cache cache.CacheManager,
 	scrapeInterval time.Duration,
 ) (*Reaper, error) {
 	if executor == nil {

block/internal/reaping/reaper_test.go

@@ -65,28 +65,21 @@ func newTestExecutor(t *testing.T) *executing.Executor {
 }
 
 // helper to create a cache manager for tests
-func newTestCache(t *testing.T) cache.Manager {
+func newTestCache(t *testing.T) cache.CacheManager {
 	t.Helper()
 
-	// Create a mock store for the cache manager
-	storeMock := testmocks.NewMockStore(t)
-	storeMock.EXPECT().GetMetadata(mock.Anything, "last-submitted-header-height").Return(nil, ds.ErrNotFound).Maybe()
-	storeMock.EXPECT().GetMetadata(mock.Anything, "last-submitted-data-height").Return(nil, ds.ErrNotFound).Maybe()
-	storeMock.EXPECT().Height(mock.Anything).Return(uint64(0), nil).Maybe()
-	storeMock.EXPECT().SetMetadata(mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
-
 	cfg := config.Config{
 		RootDir:    t.TempDir(),
 		ClearCache: true,
 	}
-	cacheManager, err := cache.NewManager(cfg, storeMock, zerolog.Nop())
+	cacheManager, err := cache.NewCacheManager(cfg, zerolog.Nop())
 	require.NoError(t, err)
 
 	return cacheManager
 }
 
 // reaper with mocks and cache manager
-func newTestReaper(t *testing.T, chainID string, execMock *testmocks.MockExecutor, seqMock *testmocks.MockSequencer, e *executing.Executor, cm cache.Manager) *Reaper {
+func newTestReaper(t *testing.T, chainID string, execMock *testmocks.MockExecutor, seqMock *testmocks.MockSequencer, e *executing.Executor, cm cache.CacheManager) *Reaper {
 	t.Helper()
 
 	r, err := NewReaper(execMock, seqMock, genesis.Genesis{ChainID: chainID}, zerolog.Nop(), e, cm, 100*time.Millisecond)

block/internal/syncing/da_retriever.go

@@ -38,7 +38,7 @@ type DARetriever interface {
 // daRetriever handles DA retrieval operations for syncing
 type daRetriever struct {
 	da      coreda.DA
-	cache   cache.Manager
+	cache   cache.CacheManager
 	genesis genesis.Genesis
 	logger  zerolog.Logger
 
@@ -63,7 +63,7 @@ type daRetriever struct {
 // NewDARetriever creates a new DA retriever
 func NewDARetriever(
 	da coreda.DA,
-	cache cache.Manager,
+	cache cache.CacheManager,
 	config config.Config,
 	genesis genesis.Genesis,
 	logger zerolog.Logger,