chore: remove cache from p2p handler

Author: julienrbrt

block/internal/syncing/p2p_handler.go

@@ -8,7 +8,6 @@ import (
 	goheader "github.com/celestiaorg/go-header"
 	"github.com/rs/zerolog"
 
-	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/types"
@@ -18,7 +17,6 @@ import (
 type P2PHandler struct {
 	headerStore goheader.Store[*types.SignedHeader]
 	dataStore   goheader.Store[*types.Data]
-	cache       cache.Manager
 	genesis     genesis.Genesis
 	options     common.BlockOptions
 	logger      zerolog.Logger
@@ -28,15 +26,13 @@ type P2PHandler struct {
 func NewP2PHandler(
 	headerStore goheader.Store[*types.SignedHeader],
 	dataStore goheader.Store[*types.Data],
-	cache cache.Manager,
 	genesis genesis.Genesis,
 	options common.BlockOptions,
 	logger zerolog.Logger,
 ) *P2PHandler {
 	return &P2PHandler{
 		headerStore: headerStore,
 		dataStore:   dataStore,
-		cache:       cache,
 		genesis:     genesis,
 		options:     options,
 		logger:      logger.With().Str("component", "p2p_handler").Logger(),

block/internal/syncing/p2p_handler_test.go

@@ -7,19 +7,14 @@ import (
 	"testing"
 	"time"
 
-	ds "github.com/ipfs/go-datastore"
-	dssync "github.com/ipfs/go-datastore/sync"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/require"
 
-	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
-	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 	signerpkg "github.com/evstack/ev-node/pkg/signer"
 	"github.com/evstack/ev-node/pkg/signer/noop"
-	"github.com/evstack/ev-node/pkg/store"
 	extmocks "github.com/evstack/ev-node/test/mocks/external"
 	"github.com/evstack/ev-node/types"
 )
@@ -74,34 +69,27 @@ type P2PTestData struct {
 	Handler      *P2PHandler
 	HeaderStore  *extmocks.MockStore[*types.SignedHeader]
 	DataStore    *extmocks.MockStore[*types.Data]
-	Cache        cache.Manager
 	Genesis      genesis.Genesis
 	ProposerAddr []byte
 	ProposerPub  crypto.PubKey
 	Signer       signerpkg.Signer
 }
 
-// setupP2P constructs a P2PHandler with mocked go-header stores and in-memory cache/store
+// setupP2P constructs a P2PHandler with mocked go-header stores
 func setupP2P(t *testing.T) *P2PTestData {
 	t.Helper()
-	datastore := dssync.MutexWrap(ds.NewMapDatastore())
-	stateStore := store.New(datastore)
-	cacheManager, err := cache.NewManager(config.DefaultConfig, stateStore, zerolog.Nop())
-	require.NoError(t, err, "failed to create cache manager")
-
 	proposerAddr, proposerPub, signer := buildTestSigner(t)
 
 	gen := genesis.Genesis{ChainID: "p2p-test", InitialHeight: 1, StartTime: time.Now().Add(-time.Second), ProposerAddress: proposerAddr}
 
 	headerStoreMock := extmocks.NewMockStore[*types.SignedHeader](t)
 	dataStoreMock := extmocks.NewMockStore[*types.Data](t)
 
-	handler := NewP2PHandler(headerStoreMock, dataStoreMock, cacheManager, gen, common.DefaultBlockOptions(), zerolog.Nop())
+	handler := NewP2PHandler(headerStoreMock, dataStoreMock, gen, common.DefaultBlockOptions(), zerolog.Nop())
 	return &P2PTestData{
 		Handler:      handler,
 		HeaderStore:  headerStoreMock,
 		DataStore:    dataStoreMock,
-		Cache:        cacheManager,
 		Genesis:      gen,
 		ProposerAddr: proposerAddr,
 		ProposerPub:  proposerPub,

block/internal/syncing/syncer.go

@@ -117,7 +117,7 @@ func (s *Syncer) Start(ctx context.Context) error {
 
 	// Initialize handlers
 	s.daRetriever = NewDARetriever(s.da, s.cache, s.config, s.genesis, s.options, s.logger)
-	s.p2pHandler = NewP2PHandler(s.headerStore, s.dataStore, s.cache, s.genesis, s.options, s.logger)
+	s.p2pHandler = NewP2PHandler(s.headerStore, s.dataStore, s.genesis, s.options, s.logger)
 
 	// Start main processing loop
 	s.wg.Add(1)