From 29ea611c86e96b215565b8c5725135dee08da324 Mon Sep 17 00:00:00 2001
From: Arpit Temani <temaniarpit27@gmail.com>
Date: Wed, 1 Jan 2025 13:06:40 +0530
Subject: [PATCH] all mocks

---
 .mockery.yaml                                 |  97 ++++---
 dataavailability/mocks_da/da_backender.go     | 263 ------------------
 l1infotreesync/mocks/eth_clienter.go          |   4 +-
 ...eorgdetector.go => mock_reorg_detector.go} |   4 +-
 reorgdetector/mock_eth_client.go              |   2 +-
 rpc/mocks/bridge_client_interface.go          |   2 +-
 rpc/mocks/bridger.go                          |   2 +-
 rpc/mocks/claim_sponsorer.go                  |   2 +-
 rpc/mocks/client_factory_interface.go         |   2 +-
 rpc/mocks/client_interface.go                 |   2 +-
 rpc/mocks/l1_info_treer.go                    |   6 +-
 rpc/mocks/last_ge_rer.go                      |   2 +-
 sync/driver.go                                |  19 --
 sync/evmdriver.go                             |   7 +
 .../{mock_l2_test.go => mock_eth_clienter.go} |   2 +-
 ...er_test.go => mock_evm_downloader_full.go} |   4 +-
 ...or_test.go => mock_processor_interface.go} |   2 +-
 ...etector_test.go => mock_reorg_detector.go} |   2 +-
 test/Makefile                                 |  26 +-
 test/helpers/mock_ethtxmanager.go             |   2 +-
 20 files changed, 94 insertions(+), 358 deletions(-)
 delete mode 100644 dataavailability/mocks_da/da_backender.go
 rename l1infotreesync/mocks/{mock_reorgdetector.go => mock_reorg_detector.go} (98%)
 delete mode 100644 sync/driver.go
 rename sync/{mock_l2_test.go => mock_eth_clienter.go} (99%)
 rename sync/{mock_downloader_test.go => mock_evm_downloader_full.go} (99%)
 rename sync/{mock_processor_test.go => mock_processor_interface.go} (99%)
 rename sync/{mock_reorgdetector_test.go => mock_reorg_detector.go} (98%)

diff --git a/.mockery.yaml b/.mockery.yaml
index 680c5c10..4f413d94 100644
--- a/.mockery.yaml
+++ b/.mockery.yaml
@@ -1,4 +1,8 @@
 with-expecter: true
+dir: "{{ .InterfaceDir }}/../mocks"
+outpkg: "mocks"
+filename: "{{ .InterfaceName | snakecase | lower }}.go"
+mockname: "{{ .InterfaceName }}"
 packages:
   github.com/agglayer/aggkit/agglayer:
     config:
@@ -12,66 +16,97 @@ packages:
           filename: mock_agglayer_client.go
   github.com/agglayer/aggkit/aggoracle/chaingersender:
     config:
-      dir: "{{ .InterfaceDir }}/../mocks"
-      outpkg: "mocks"
     interfaces:
       EthTxManager:
         config:
-          mockname: EthTxManagerMock
-          filename: mock_ethtxmanager.go
+        configs:
+          - mockname: EthTxManagerMock
+            filename: mock_ethtxmanager.go
+          - mockname: EthTxManagerMock
+            filename: mock_ethtxmanager.go
+            dir: "{{ .InterfaceDir }}/../../test/helpers"
+            outpkg: "helpers"
       L2GERManagerContract:
         config:
           mockname: L2GERManagerMock
           filename: mock_l2germanager.go
   github.com/agglayer/aggkit/aggsender/db:
     config:
-      dir: "{{.InterfaceDir}}/../mocks"
-      outpkg: "mocks"
-      filename: "{{ .InterfaceName | snakecase | lower }}.go"
-      mockname: "{{ .InterfaceName }}"
     interfaces:
       AggSenderStorage:
-        config:
   github.com/agglayer/aggkit/aggsender/rpc:
     config:
-      dir: "{{.InterfaceDir}}/../mocks"
-      outpkg: "mocks"
-      mockname: "{{ .InterfaceName }}"
-      filename: "{{ .InterfaceName | snakecase | lower }}.go"
     interfaces:
       aggsenderInterface:
-        config:
       aggsenderStorer:
-        config:
   github.com/agglayer/aggkit/aggsender/types:
     config:
-      dir: "{{.InterfaceDir}}/../mocks"
-      outpkg: "mocks"
-      mockname: "{{ .InterfaceName }}"
-      filename: "{{ .InterfaceName | snakecase | lower }}.go"
     interfaces:
       BlockNotifier:
-        config:
       EpochNotifier:
-        config:
       EthClient:
-        config:
       GenericSubscriber:
-        config:
       L1InfoTreeSyncer:
-        config:
       L2BridgeSyncer:
-        config:
       Logger:
-        config:
   github.com/agglayer/aggkit/bridgesync:
     config:
-      dir: "{{.InterfaceDir}}/mocks"
-      outpkg: "mocks"
-      mockname: "{{ .InterfaceName }}"
-      filename: "{{ .InterfaceName | snakecase | lower }}.go"
+      dir: "{{ .InterfaceDir }}/mocks"
     interfaces:
       ReorgDetector:
+      EthClienter:
+  github.com/agglayer/aggkit/l1infotreesync:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      EthClienter:
+  github.com/agglayer/aggkit/reorgdetector:
+    config:
+      dir: "{{ .InterfaceDir }}"
+      outpkg: "{{ .PackageName }}"
+      mockname: "{{ .InterfaceName }}Mock"
+      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+    interfaces:
+      EthClient:
+  github.com/agglayer/aggkit/rpc/client:
+    config:
+    interfaces:
+      BridgeClientInterface:
+      ClientInterface:
+      ClientFactoryInterface:
+  github.com/agglayer/aggkit/rpc:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      Bridger:
+      LastGERer:
+      L1InfoTreer:
+      ClaimSponsorer:
+  github.com/agglayer/aggkit/sync:
+    config:
+      dir: "{{ .InterfaceDir }}"
+      outpkg: "{{ .PackageName }}"
+      mockname: "{{ .InterfaceName }}Mock"
+      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+      inpackage: True
+    interfaces:
+      ReorgDetector:
+        configs:
+          - dir: "{{ .InterfaceDir }}/../l1infotreesync/mocks"
+            outpkg: "mocks"
+            mockname: "{{ .InterfaceName }}Mock"
+            filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+            inpackage: False
+          - dir: "{{ .InterfaceDir }}"
+            outpkg: "{{ .PackageName }}"
+            mockname: "{{ .InterfaceName }}Mock"
+            filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+      processorInterface:
+        config:
+          mockname: "ProcessorMock"
+      evmDownloaderFull:
         config:
+          mockname: "EVMDownloaderMock"
       EthClienter:
-        config:
\ No newline at end of file
+        config:
+          mockname: "L2Mock"
\ No newline at end of file
diff --git a/dataavailability/mocks_da/da_backender.go b/dataavailability/mocks_da/da_backender.go
deleted file mode 100644
index 73c732c4..00000000
--- a/dataavailability/mocks_da/da_backender.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Code generated by mockery. DO NOT EDIT.
-
-package mocks_da
-
-import (
-	context "context"
-
-	common "github.com/ethereum/go-ethereum/common"
-
-	etherman "github.com/agglayer/aggkit/etherman"
-
-	mock "github.com/stretchr/testify/mock"
-)
-
-// DABackender is an autogenerated mock type for the DABackender type
-type DABackender struct {
-	mock.Mock
-}
-
-type DABackender_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *DABackender) EXPECT() *DABackender_Expecter {
-	return &DABackender_Expecter{mock: &_m.Mock}
-}
-
-// GetSequence provides a mock function with given fields: ctx, batchHashes, dataAvailabilityMessage
-func (_m *DABackender) GetSequence(ctx context.Context, batchHashes []common.Hash, dataAvailabilityMessage []byte) ([][]byte, error) {
-	ret := _m.Called(ctx, batchHashes, dataAvailabilityMessage)
-
-	if len(ret) == 0 {
-		panic("no return value specified for GetSequence")
-	}
-
-	var r0 [][]byte
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, []common.Hash, []byte) ([][]byte, error)); ok {
-		return rf(ctx, batchHashes, dataAvailabilityMessage)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, []common.Hash, []byte) [][]byte); ok {
-		r0 = rf(ctx, batchHashes, dataAvailabilityMessage)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([][]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, []common.Hash, []byte) error); ok {
-		r1 = rf(ctx, batchHashes, dataAvailabilityMessage)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// DABackender_GetSequence_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetSequence'
-type DABackender_GetSequence_Call struct {
-	*mock.Call
-}
-
-// GetSequence is a helper method to define mock.On call
-//   - ctx context.Context
-//   - batchHashes []common.Hash
-//   - dataAvailabilityMessage []byte
-func (_e *DABackender_Expecter) GetSequence(ctx interface{}, batchHashes interface{}, dataAvailabilityMessage interface{}) *DABackender_GetSequence_Call {
-	return &DABackender_GetSequence_Call{Call: _e.mock.On("GetSequence", ctx, batchHashes, dataAvailabilityMessage)}
-}
-
-func (_c *DABackender_GetSequence_Call) Run(run func(ctx context.Context, batchHashes []common.Hash, dataAvailabilityMessage []byte)) *DABackender_GetSequence_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].([]common.Hash), args[2].([]byte))
-	})
-	return _c
-}
-
-func (_c *DABackender_GetSequence_Call) Return(_a0 [][]byte, _a1 error) *DABackender_GetSequence_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *DABackender_GetSequence_Call) RunAndReturn(run func(context.Context, []common.Hash, []byte) ([][]byte, error)) *DABackender_GetSequence_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Init provides a mock function with given fields:
-func (_m *DABackender) Init() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Init")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// DABackender_Init_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Init'
-type DABackender_Init_Call struct {
-	*mock.Call
-}
-
-// Init is a helper method to define mock.On call
-func (_e *DABackender_Expecter) Init() *DABackender_Init_Call {
-	return &DABackender_Init_Call{Call: _e.mock.On("Init")}
-}
-
-func (_c *DABackender_Init_Call) Run(run func()) *DABackender_Init_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *DABackender_Init_Call) Return(_a0 error) *DABackender_Init_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *DABackender_Init_Call) RunAndReturn(run func() error) *DABackender_Init_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// PostSequenceBanana provides a mock function with given fields: ctx, sequence
-func (_m *DABackender) PostSequenceBanana(ctx context.Context, sequence etherman.SequenceBanana) ([]byte, error) {
-	ret := _m.Called(ctx, sequence)
-
-	if len(ret) == 0 {
-		panic("no return value specified for PostSequenceBanana")
-	}
-
-	var r0 []byte
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, etherman.SequenceBanana) ([]byte, error)); ok {
-		return rf(ctx, sequence)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, etherman.SequenceBanana) []byte); ok {
-		r0 = rf(ctx, sequence)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, etherman.SequenceBanana) error); ok {
-		r1 = rf(ctx, sequence)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// DABackender_PostSequenceBanana_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'PostSequenceBanana'
-type DABackender_PostSequenceBanana_Call struct {
-	*mock.Call
-}
-
-// PostSequenceBanana is a helper method to define mock.On call
-//   - ctx context.Context
-//   - sequence etherman.SequenceBanana
-func (_e *DABackender_Expecter) PostSequenceBanana(ctx interface{}, sequence interface{}) *DABackender_PostSequenceBanana_Call {
-	return &DABackender_PostSequenceBanana_Call{Call: _e.mock.On("PostSequenceBanana", ctx, sequence)}
-}
-
-func (_c *DABackender_PostSequenceBanana_Call) Run(run func(ctx context.Context, sequence etherman.SequenceBanana)) *DABackender_PostSequenceBanana_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(etherman.SequenceBanana))
-	})
-	return _c
-}
-
-func (_c *DABackender_PostSequenceBanana_Call) Return(_a0 []byte, _a1 error) *DABackender_PostSequenceBanana_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *DABackender_PostSequenceBanana_Call) RunAndReturn(run func(context.Context, etherman.SequenceBanana) ([]byte, error)) *DABackender_PostSequenceBanana_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// PostSequenceElderberry provides a mock function with given fields: ctx, batchesData
-func (_m *DABackender) PostSequenceElderberry(ctx context.Context, batchesData [][]byte) ([]byte, error) {
-	ret := _m.Called(ctx, batchesData)
-
-	if len(ret) == 0 {
-		panic("no return value specified for PostSequenceElderberry")
-	}
-
-	var r0 []byte
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, [][]byte) ([]byte, error)); ok {
-		return rf(ctx, batchesData)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, [][]byte) []byte); ok {
-		r0 = rf(ctx, batchesData)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, [][]byte) error); ok {
-		r1 = rf(ctx, batchesData)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// DABackender_PostSequenceElderberry_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'PostSequenceElderberry'
-type DABackender_PostSequenceElderberry_Call struct {
-	*mock.Call
-}
-
-// PostSequenceElderberry is a helper method to define mock.On call
-//   - ctx context.Context
-//   - batchesData [][]byte
-func (_e *DABackender_Expecter) PostSequenceElderberry(ctx interface{}, batchesData interface{}) *DABackender_PostSequenceElderberry_Call {
-	return &DABackender_PostSequenceElderberry_Call{Call: _e.mock.On("PostSequenceElderberry", ctx, batchesData)}
-}
-
-func (_c *DABackender_PostSequenceElderberry_Call) Run(run func(ctx context.Context, batchesData [][]byte)) *DABackender_PostSequenceElderberry_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].([][]byte))
-	})
-	return _c
-}
-
-func (_c *DABackender_PostSequenceElderberry_Call) Return(_a0 []byte, _a1 error) *DABackender_PostSequenceElderberry_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *DABackender_PostSequenceElderberry_Call) RunAndReturn(run func(context.Context, [][]byte) ([]byte, error)) *DABackender_PostSequenceElderberry_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewDABackender creates a new instance of DABackender. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewDABackender(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *DABackender {
-	mock := &DABackender{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
diff --git a/l1infotreesync/mocks/eth_clienter.go b/l1infotreesync/mocks/eth_clienter.go
index 270c40d9..d89cbd98 100644
--- a/l1infotreesync/mocks/eth_clienter.go
+++ b/l1infotreesync/mocks/eth_clienter.go
@@ -1,6 +1,6 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
-package mocks_l1infotreesync
+package mocks
 
 import (
 	context "context"
diff --git a/l1infotreesync/mocks/mock_reorgdetector.go b/l1infotreesync/mocks/mock_reorg_detector.go
similarity index 98%
rename from l1infotreesync/mocks/mock_reorgdetector.go
rename to l1infotreesync/mocks/mock_reorg_detector.go
index f92260c3..5d0c2f9b 100644
--- a/l1infotreesync/mocks/mock_reorgdetector.go
+++ b/l1infotreesync/mocks/mock_reorg_detector.go
@@ -1,6 +1,6 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
-package mocks_l1infotreesync
+package mocks
 
 import (
 	context "context"
diff --git a/reorgdetector/mock_eth_client.go b/reorgdetector/mock_eth_client.go
index 1a42104b..ed33e8b2 100644
--- a/reorgdetector/mock_eth_client.go
+++ b/reorgdetector/mock_eth_client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package reorgdetector
 
diff --git a/rpc/mocks/bridge_client_interface.go b/rpc/mocks/bridge_client_interface.go
index 69b6093a..130bb526 100644
--- a/rpc/mocks/bridge_client_interface.go
+++ b/rpc/mocks/bridge_client_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/rpc/mocks/bridger.go b/rpc/mocks/bridger.go
index 44c8ab1f..8ea4247e 100644
--- a/rpc/mocks/bridger.go
+++ b/rpc/mocks/bridger.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/rpc/mocks/claim_sponsorer.go b/rpc/mocks/claim_sponsorer.go
index 633d1321..bee2aa2a 100644
--- a/rpc/mocks/claim_sponsorer.go
+++ b/rpc/mocks/claim_sponsorer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/rpc/mocks/client_factory_interface.go b/rpc/mocks/client_factory_interface.go
index 2a54ac7e..aa7254c4 100644
--- a/rpc/mocks/client_factory_interface.go
+++ b/rpc/mocks/client_factory_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/rpc/mocks/client_interface.go b/rpc/mocks/client_interface.go
index 32be99fc..80312a5e 100644
--- a/rpc/mocks/client_interface.go
+++ b/rpc/mocks/client_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/rpc/mocks/l1_info_treer.go b/rpc/mocks/l1_info_treer.go
index e7441155..52dd1e85 100644
--- a/rpc/mocks/l1_info_treer.go
+++ b/rpc/mocks/l1_info_treer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
@@ -27,7 +27,7 @@ func (_m *L1InfoTreer) EXPECT() *L1InfoTreer_Expecter {
 	return &L1InfoTreer_Expecter{mock: &_m.Mock}
 }
 
-// GetFirstInfo provides a mock function with given fields:
+// GetFirstInfo provides a mock function with no fields
 func (_m *L1InfoTreer) GetFirstInfo() (*l1infotreesync.L1InfoTreeLeaf, error) {
 	ret := _m.Called()
 
@@ -376,7 +376,7 @@ func (_c *L1InfoTreer_GetInfoByIndex_Call) RunAndReturn(run func(context.Context
 	return _c
 }
 
-// GetLastInfo provides a mock function with given fields:
+// GetLastInfo provides a mock function with no fields
 func (_m *L1InfoTreer) GetLastInfo() (*l1infotreesync.L1InfoTreeLeaf, error) {
 	ret := _m.Called()
 
diff --git a/rpc/mocks/last_ge_rer.go b/rpc/mocks/last_ge_rer.go
index 160153f7..adb61ca2 100644
--- a/rpc/mocks/last_ge_rer.go
+++ b/rpc/mocks/last_ge_rer.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package mocks
 
diff --git a/sync/driver.go b/sync/driver.go
deleted file mode 100644
index f85c04fb..00000000
--- a/sync/driver.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package sync
-
-import (
-	"context"
-	"errors"
-)
-
-var ErrInconsistentState = errors.New("state is inconsistent, try again later once the state is consolidated")
-
-type Block struct {
-	Num    uint64
-	Events []interface{}
-}
-
-type ProcessorInterface interface {
-	GetLastProcessedBlock(ctx context.Context) (uint64, error)
-	ProcessBlock(block Block) error
-	Reorg(firstReorgedBlock uint64) error
-}
diff --git a/sync/evmdriver.go b/sync/evmdriver.go
index 72476cef..cfa96f41 100644
--- a/sync/evmdriver.go
+++ b/sync/evmdriver.go
@@ -9,6 +9,13 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+var ErrInconsistentState = errors.New("state is inconsistent, try again later once the state is consolidated")
+
+type Block struct {
+	Num    uint64
+	Events []interface{}
+}
+
 type evmDownloaderFull interface {
 	EVMDownloaderInterface
 	downloader
diff --git a/sync/mock_l2_test.go b/sync/mock_eth_clienter.go
similarity index 99%
rename from sync/mock_l2_test.go
rename to sync/mock_eth_clienter.go
index 955af0db..bf19df78 100644
--- a/sync/mock_l2_test.go
+++ b/sync/mock_eth_clienter.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package sync
 
diff --git a/sync/mock_downloader_test.go b/sync/mock_evm_downloader_full.go
similarity index 99%
rename from sync/mock_downloader_test.go
rename to sync/mock_evm_downloader_full.go
index 45a53b84..1cdebef2 100644
--- a/sync/mock_downloader_test.go
+++ b/sync/mock_evm_downloader_full.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package sync
 
@@ -53,7 +53,7 @@ func (_c *EVMDownloaderMock_Download_Call) Return() *EVMDownloaderMock_Download_
 }
 
 func (_c *EVMDownloaderMock_Download_Call) RunAndReturn(run func(context.Context, uint64, chan EVMBlock)) *EVMDownloaderMock_Download_Call {
-	_c.Call.Return(run)
+	_c.Run(run)
 	return _c
 }
 
diff --git a/sync/mock_processor_test.go b/sync/mock_processor_interface.go
similarity index 99%
rename from sync/mock_processor_test.go
rename to sync/mock_processor_interface.go
index 96ece8d4..aa3d0330 100644
--- a/sync/mock_processor_test.go
+++ b/sync/mock_processor_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package sync
 
diff --git a/sync/mock_reorgdetector_test.go b/sync/mock_reorg_detector.go
similarity index 98%
rename from sync/mock_reorgdetector_test.go
rename to sync/mock_reorg_detector.go
index 9faaadb9..8fb75be3 100644
--- a/sync/mock_reorgdetector_test.go
+++ b/sync/mock_reorg_detector.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package sync
 
diff --git a/test/Makefile b/test/Makefile
index 3c509627..21d90dce 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,31 +1,7 @@
 .PHONY: generate-mocks
-generate-mocks:	generate-mocks-da \
-	generate-mocks-l1infotreesync generate-mocks-helpers \
-	generate-mocks-sync \
+generate-mocks:	
 	mockery
 
-COMMON_MOCKERY_PARAMS=--disable-version-string --with-expecter --exported
-
-.PHONY: generate-mocks-rpc
-generate-mocks-rpc: ## Generates mocks for rpc, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../rpc --output ../rpc/mocks --outpkg mocks ${COMMON_MOCKERY_PARAMS}
-
-.PHONY: generate-mocks-l1infotreesync
-generate-mocks-l1infotreesync: ## Generates mocks for l1infotreesync, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../l1infotreesync --output ../l1infotreesync/mocks --outpkg mocks_l1infotreesync ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=ReorgDetector --dir=../sync --output=../l1infotreesync/mocks --outpkg=mocks_l1infotreesync --structname=ReorgDetectorMock --filename=mock_reorgdetector.go ${COMMON_MOCKERY_PARAMS}
-	
-.PHONY: generate-mocks-helpers
-generate-mocks-helpers: ## Generates mocks for helpers, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=EthTxManager --dir=../aggoracle/chaingersender --output=./helpers --outpkg=helpers --structname=EthTxManagerMock --filename=mock_ethtxmanager.go ${COMMON_MOCKERY_PARAMS}
-
-.PHONY: generate-mocks-sync
-generate-mocks-sync: ## Generates mocks for sync, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=EthClienter --dir=../sync --output=../sync --outpkg=sync --inpackage --structname=L2Mock --filename=mock_l2_test.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=evmDownloaderFull --dir=../sync --output=../sync --outpkg=sync --inpackage --structname=EVMDownloaderMock --filename=mock_downloader_test.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=processorInterface --dir=../sync --output=../sync --outpkg=sync --inpackage --structname=ProcessorMock --filename=mock_processor_test.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=ReorgDetector --dir=../sync --output=../sync --outpkg=sync --inpackage --structname=ReorgDetectorMock --filename=mock_reorgdetector_test.go ${COMMON_MOCKERY_PARAMS}
-	
 .PHONY: test-e2e-fork12-pessimistic
 test-e2e-fork12-pessimistic: stop
 	./run-e2e.sh fork12 pessimistic
diff --git a/test/helpers/mock_ethtxmanager.go b/test/helpers/mock_ethtxmanager.go
index ac10be2a..0d614887 100644
--- a/test/helpers/mock_ethtxmanager.go
+++ b/test/helpers/mock_ethtxmanager.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v2.50.2. DO NOT EDIT.
 
 package helpers