fix mock

Author: julienrbrt

.mockery.yaml

@@ -48,11 +48,6 @@ packages:
           filename: external/hstore.go
   github.com/evstack/ev-node/block/internal/syncing:
     interfaces:
-      DaRetrieverI:
-        config:
-          dir: ./block/internal/syncing
-          pkgname: syncing
-          filename: syncer_mock.go
       p2pHandler:
         config:
           dir: ./block/internal/syncing
@@ -65,3 +60,8 @@ packages:
           dir: ./block/internal/common
           pkgname: common
           filename: broadcaster_mock.go
+      DARetriever:
+        config:
+          dir: ./block/internal/common
+          pkgname: common
+          filename: da_retriever_mock.go

block/internal/common/da_retriever_mock.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
-	"github.com/evstack/ev-node/block/internal/syncing"
 	coreseq "github.com/evstack/ev-node/core/sequencer"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
@@ -57,7 +56,7 @@ func TestLazyMode_ProduceBlockLogic(t *testing.T) {
 		memStore,
 		mockExec,
 		mockSeq,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,
@@ -168,7 +167,7 @@ func TestRegularMode_ProduceBlockLogic(t *testing.T) {
 		memStore,
 		mockExec,
 		mockSeq,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,

block/internal/executing/executor_lazy_test.go

@@ -16,7 +16,6 @@ import (
 
 	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
-	"github.com/evstack/ev-node/block/internal/syncing"
 	coreseq "github.com/evstack/ev-node/core/sequencer"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
@@ -79,7 +78,7 @@ func TestProduceBlock_EmptyBatch_SetsEmptyDataHash(t *testing.T) {
 		memStore,
 		mockExec,
 		mockSeq,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,
@@ -167,7 +166,7 @@ func TestPendingLimit_SkipsProduction(t *testing.T) {
 		memStore,
 		mockExec,
 		mockSeq,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,

block/internal/executing/executor_logic_test.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
-	"github.com/evstack/ev-node/block/internal/syncing"
 	coreseq "github.com/evstack/ev-node/core/sequencer"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
@@ -57,7 +56,7 @@ func TestExecutor_RestartUsesPendingHeader(t *testing.T) {
 		memStore,
 		mockExec1,
 		mockSeq1,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,
@@ -177,7 +176,7 @@ func TestExecutor_RestartUsesPendingHeader(t *testing.T) {
 		memStore, // same store
 		mockExec2,
 		mockSeq2,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,
@@ -276,7 +275,7 @@ func TestExecutor_RestartNoPendingHeader(t *testing.T) {
 		memStore,
 		mockExec1,
 		mockSeq1,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,
@@ -329,7 +328,7 @@ func TestExecutor_RestartNoPendingHeader(t *testing.T) {
 		memStore,
 		mockExec2,
 		mockSeq2,
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		signerWrapper,
 		cacheManager,
 		metrics,

block/internal/executing/executor_restart_test.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/evstack/ev-node/block/internal/cache"
 	"github.com/evstack/ev-node/block/internal/common"
-	"github.com/evstack/ev-node/block/internal/syncing"
 	"github.com/evstack/ev-node/pkg/config"
 	"github.com/evstack/ev-node/pkg/genesis"
 	"github.com/evstack/ev-node/pkg/store"
@@ -49,7 +48,7 @@ func TestExecutor_BroadcasterIntegration(t *testing.T) {
 		memStore,
 		nil, // nil executor (we're not testing execution)
 		nil, // nil sequencer (we're not testing sequencing)
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		testSigner, // test signer (required for executor)
 		cacheManager,
 		metrics,
@@ -100,7 +99,7 @@ func TestExecutor_NilBroadcasters(t *testing.T) {
 		memStore,
 		nil, // nil executor
 		nil, // nil sequencer
-		syncing.NewMockDaRetrieverI(t),
+		common.NewMockDARetriever(t),
 		testSigner, // test signer (required for executor)
 		cacheManager,
 		metrics,

block/internal/executing/executor_test.go

@@ -69,7 +69,7 @@ func TestSyncer_BackoffOnDAError(t *testing.T) {
 			syncer.ctx = ctx
 
 			// Setup mocks
-			daRetriever := NewMockDaRetrieverI(t)
+			daRetriever := common.NewMockDARetriever(t)
 			p2pHandler := newMockp2pHandler(t)
 			syncer.daRetriever = daRetriever
 			syncer.p2pHandler = p2pHandler
@@ -167,7 +167,7 @@ func TestSyncer_BackoffResetOnSuccess(t *testing.T) {
 	addr, pub, signer := buildSyncTestSigner(t)
 	gen := syncer.genesis
 
-	daRetriever := NewMockDaRetrieverI(t)
+	daRetriever := common.NewMockDARetriever(t)
 	p2pHandler := newMockp2pHandler(t)
 	syncer.daRetriever = daRetriever
 	syncer.p2pHandler = p2pHandler
@@ -260,7 +260,7 @@ func TestSyncer_BackoffBehaviorIntegration(t *testing.T) {
 	syncer := setupTestSyncer(t, 500*time.Millisecond)
 	syncer.ctx = ctx
 
-	daRetriever := NewMockDaRetrieverI(t)
+	daRetriever := common.NewMockDARetriever(t)
 	p2pHandler := newMockp2pHandler(t)
 	syncer.daRetriever = daRetriever
 	syncer.p2pHandler = p2pHandler

block/internal/syncing/syncer_backoff_test.go

@@ -131,7 +131,7 @@ func newBenchFixture(b *testing.B, totalHeights uint64, shuffledTx bool, daDelay
 	}
 
 	// Mock DA retriever to emit exactly totalHeights events, then HFF and cancel
-	daR := NewMockDaRetrieverI(b)
+	daR := common.NewMockDARetriever(b)
 	for i := uint64(0); i < totalHeights; i++ {
 		daHeight := i + daHeightOffset
 		daR.On("RetrieveFromDA", mock.Anything, daHeight).