all mocks

agglayer · Jan 1, 2025 · 2d3f330 · 2d3f330
1 parent 1a04c8d
commit 2d3f330
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 92 deletions.
diff --git 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,8 +16,6 @@ packages:
           filename: mock_agglayer_client.go
   github.com/agglayer/aggkit/aggoracle/chaingersender:
     config:
-      dir: "{{ .InterfaceDir }}/../mocks"
-      outpkg: "mocks"
     interfaces:
       EthTxManager:
         config:
@@ -25,53 +27,81 @@ packages:
           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:
+        config:
+          mockname: "L2Mock"
diff --git a/l1infotreesync/mocks/eth_clienter.go b/l1infotreesync/mocks/eth_clienter.go
diff --git a/l1infotreesync/mocks/mock_reorgdetector.go → l1infotreesync/mocks/mock_reorg_detector.go b/l1infotreesync/mocks/mock_reorgdetector.go → l1infotreesync/mocks/mock_reorg_detector.go
diff --git a/reorgdetector/mock_eth_client.go b/reorgdetector/mock_eth_client.go
diff --git a/rpc/mocks/bridge_client_interface.go b/rpc/mocks/bridge_client_interface.go
diff --git a/rpc/mocks/bridger.go b/rpc/mocks/bridger.go
diff --git a/rpc/mocks/claim_sponsorer.go b/rpc/mocks/claim_sponsorer.go
diff --git a/rpc/mocks/client_factory_interface.go b/rpc/mocks/client_factory_interface.go
diff --git a/rpc/mocks/client_interface.go b/rpc/mocks/client_interface.go
diff --git a/rpc/mocks/l1_info_treer.go b/rpc/mocks/l1_info_treer.go
diff --git a/rpc/mocks/last_ge_rer.go b/rpc/mocks/last_ge_rer.go
diff --git a/sync/driver.go b/sync/driver.go
diff --git 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 → sync/mock_eth_clienter.go b/sync/mock_l2_test.go → sync/mock_eth_clienter.go
diff --git a/sync/mock_downloader_test.go → sync/mock_evm_downloader_full.go b/sync/mock_downloader_test.go → sync/mock_evm_downloader_full.go
diff --git a/sync/mock_processor_test.go → sync/mock_processor_interface.go b/sync/mock_processor_test.go → sync/mock_processor_interface.go
diff --git a/sync/mock_reorgdetector_test.go → sync/mock_reorg_detector.go b/sync/mock_reorgdetector_test.go → sync/mock_reorg_detector.go
diff --git 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