mockery generate

0xPolygon · Jan 1, 2025 · 8cdd1b1 · 8cdd1b1
1 parent 79c94e2
commit 8cdd1b1
Showing 51 changed files with 218 additions and 704 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -0,0 +1,149 @@
+with-expecter: true
+issue-845-fix: True
+resolve-type-alias: False
+dir: "{{ .InterfaceDir }}/../mocks"
+outpkg: "mocks"
+filename: "{{ .InterfaceName | snakecase | lower }}.go"
+mockname: "{{ .InterfaceName }}"
+packages:
+  github.com/0xPolygon/cdk/agglayer:
+    config:
+      inpackage: True
+      dir: "{{ .InterfaceDir }}"
+      outpkg: "{{ .PackageName }}"
+    interfaces:
+      AgglayerClientInterface:
+        config:
+          mockname: AgglayerClientMock
+          filename: mock_agglayer_client.go
+  github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer:
+    config:
+    interfaces:
+      Synchronizer:
+        config:
+          dir: "./aggregator/mocks"
+          mockname: "{{ .InterfaceName }}InterfaceMock"
+          filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+  github.com/0xPolygon/cdk/aggregator:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+      mockname: "{{ .InterfaceName }}Mock"
+    interfaces:
+      ProverInterface:
+      Etherman:
+      StorageInterface:
+      EthTxManagerClient:
+      RPCInterface:
+  github.com/0xPolygon/cdk/aggregator/prover:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      AggregatorService_ChannelServer:
+        config:
+          mockname: ChannelMock
+          filename: mock_channel.go
+  github.com/0xPolygon/cdk/bridgesync:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      ReorgDetector:
+      EthClienter:
+  github.com/0xPolygon/cdk/dataavailability:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks_da"
+      all: True
+      outpkg: "mocks_da"
+  github.com/0xPolygon/cdk/db:
+    config:
+      dir: "{{ .InterfaceDir }}/../aggregator/mocks"
+      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+      mockname: "{{ .InterfaceName }}Mock"
+    interfaces:
+      Txer:
+  github.com/0xPolygon/cdk/l1infotreesync:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      EthClienter:
+  github.com/0xPolygon/cdk/reorgdetector:
+    config:
+      dir: "{{ .InterfaceDir }}"
+      outpkg: "{{ .PackageName }}"
+      mockname: "{{ .InterfaceName }}Mock"
+      filename: "mock_{{ .InterfaceName | snakecase | lower }}.go"
+    interfaces:
+      EthClient:
+  github.com/0xPolygon/cdk/rpc/client:
+    config:
+    interfaces:
+      BridgeClientInterface:
+      ClientInterface:
+      ClientFactoryInterface:
+  github.com/0xPolygon/cdk/rpc:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+    interfaces:
+      Bridger:
+      LastGERer:
+      L1InfoTreer:
+      ClaimSponsorer:
+  github.com/0xPolygon/cdk/sequencesender:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks"
+      outpkg: "mocks"
+      mockname: "{{ .InterfaceName }}Mock"
+    interfaces:
+      EthTxManager:
+        configs:
+          - mockname: EthTxManagerMock
+            filename: mock_ethtxmanager.go
+          - mockname: EthTxManagerMock
+            filename: mock_ethtxmanager.go
+            dir: "{{ .InterfaceDir }}/../test/helpers"
+            outpkg: "helpers"
+      Etherman:
+      RPCInterface:
+  github.com/0xPolygon/cdk/sequencesender/txbuilder:
+    config:
+      dir: "{{ .InterfaceDir }}/mocks_txbuilder"
+      all: True
+      outpkg: "mocks_txbuilder"
+      mockname: "{{ .InterfaceName | camelcase | firstUpper }}"
+    interfaces:
+      TxBuilder:
+        configs:
+          - dir: "{{ .InterfaceDir }}/../mocks"
+            outpkg: "mocks"
+            mockname: "{{ .InterfaceName | camelcase | firstUpper }}Mock"
+          - dir: "{{ .InterfaceDir }}/mocks_txbuilder"
+            outpkg: "mocks_txbuilder"
+            mockname: "{{ .InterfaceName | camelcase | firstUpper }}"
+  github.com/0xPolygon/cdk/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:
+          mockname: "L2Mock"
diff --git a/agglayer/mock_agglayer_client.go b/agglayer/mock_agglayer_client.go
diff --git a/aggregator/mocks/mock_eth_tx_manager.go → ...gator/mocks/mock_eth_tx_manager_client.go b/aggregator/mocks/mock_eth_tx_manager.go → ...gator/mocks/mock_eth_tx_manager_client.go
diff --git a/aggregator/mocks/mock_etherman.go b/aggregator/mocks/mock_etherman.go
diff --git a/aggregator/mocks/mock_prover.go → aggregator/mocks/mock_prover_interface.go b/aggregator/mocks/mock_prover.go → aggregator/mocks/mock_prover_interface.go
diff --git a/aggregator/mocks/mock_rpc.go → aggregator/mocks/mock_rpc_interface.go b/aggregator/mocks/mock_rpc.go → aggregator/mocks/mock_rpc_interface.go
diff --git a/aggregator/mocks/mock_storage.go → aggregator/mocks/mock_storage_interface.go b/aggregator/mocks/mock_storage.go → aggregator/mocks/mock_storage_interface.go
diff --git a/aggregator/mocks/mock_synchronizer.go b/aggregator/mocks/mock_synchronizer.go
diff --git a/aggregator/mocks/mock_txer.go b/aggregator/mocks/mock_txer.go
diff --git a/aggregator/prover/mocks/mock_channel.go b/aggregator/prover/mocks/mock_channel.go
diff --git a/bridgesync/mock_l2_test.go b/bridgesync/mock_l2_test.go
diff --git a/bridgesync/mocks/eth_clienter.go b/bridgesync/mocks/eth_clienter.go
diff --git a/bridgesync/mocks/reorg_detector.go b/bridgesync/mocks/reorg_detector.go
diff --git a/dataavailability/mocks_da/batch_data_provider.go b/dataavailability/mocks_da/batch_data_provider.go
diff --git a/dataavailability/mocks_da/da_backender.go b/dataavailability/mocks_da/da_backender.go
diff --git a/dataavailability/mocks_da/data_manager.go b/dataavailability/mocks_da/data_manager.go
diff --git a/dataavailability/mocks_da/sequence_retriever.go b/dataavailability/mocks_da/sequence_retriever.go
diff --git a/dataavailability/mocks_da/sequence_sender.go b/dataavailability/mocks_da/sequence_sender.go
diff --git a/dataavailability/mocks_da/sequence_sender_banana.go b/dataavailability/mocks_da/sequence_sender_banana.go
diff --git a/dataavailability/mocks_da/sequence_sender_elderberry.go b/dataavailability/mocks_da/sequence_sender_elderberry.go
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/sequencesender/mocks/mock_etherman.go → sequencesender/mocks/etherman.go b/sequencesender/mocks/mock_etherman.go → sequencesender/mocks/etherman.go
diff --git a/sequencesender/mocks/mock_ethtxmanager.go b/sequencesender/mocks/mock_ethtxmanager.go
diff --git a/sequencesender/mocks/mock_rpc.go → sequencesender/mocks/rpc_interface.go b/sequencesender/mocks/mock_rpc.go → sequencesender/mocks/rpc_interface.go
diff --git a/sequencesender/mocks/mock_txbuilder.go → sequencesender/mocks/tx_builder.go b/sequencesender/mocks/mock_txbuilder.go → sequencesender/mocks/tx_builder.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/cond_new_sequence.go b/sequencesender/txbuilder/mocks_txbuilder/cond_new_sequence.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/global_exit_root_banana_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/global_exit_root_banana_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/global_exit_root_banana_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/global_exit_root_banana_zkevm_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/l1_client.go b/sequencesender/txbuilder/mocks_txbuilder/l1_client.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/l1_info_syncer.go b/sequencesender/txbuilder/mocks_txbuilder/l1_info_syncer.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_base_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_base_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_validium_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_validium_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/rollup_banana_zkevm_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/rollup_elderberry_validium_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/rollup_elderberry_validium_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/rollup_elderberry_zkevm_contractor.go b/sequencesender/txbuilder/mocks_txbuilder/rollup_elderberry_zkevm_contractor.go
diff --git a/sequencesender/txbuilder/mocks_txbuilder/tx_builder.go b/sequencesender/txbuilder/mocks_txbuilder/tx_builder.go
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,64 +1,6 @@
 .PHONY: generate-mocks
-generate-mocks:	generate-mocks-bridgesync generate-mocks-reorgdetector \
-	generate-mocks-sequencesender generate-mocks-da \
-	generate-mocks-l1infotreesync generate-mocks-helpers \
-	generate-mocks-sync generate-mocks-aggregator \
-	generate-mocks-agglayer
-
-.PHONY: generate-mocks-bridgesync
-generate-mocks-bridgesync: ## Generates mocks for bridgesync, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../bridgesync --output ../bridgesync/mocks --outpkg mocks_bridgesync ${COMMON_MOCKERY_PARAMS}
-
-.PHONY: generate-mocks-reorgdetector
-generate-mocks-reorgdetector: ## Generates mocks for reorgdetector, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=EthClient --dir=../reorgdetector --output=../reorgdetector --outpkg=reorgdetector --inpackage --structname=EthClientMock --filename=mock_eth_client.go ${COMMON_MOCKERY_PARAMS}
-
-COMMON_MOCKERY_PARAMS=--disable-version-string --with-expecter --exported
-.PHONY: generate-mocks-sequencesender
-generate-mocks-sequencesender: ## Generates mocks for sequencesender, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../sequencesender/txbuilder --output ../sequencesender/txbuilder/mocks_txbuilder --outpkg mocks_txbuilder ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=EthTxManager --dir=../sequencesender --output=../sequencesender/mocks --outpkg=mocks --structname=EthTxManagerMock --filename=mock_ethtxmanager.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=Etherman --dir=../sequencesender --output=../sequencesender/mocks --outpkg=mocks --structname=EthermanMock --filename=mock_etherman.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=RPCInterface --dir=../sequencesender --output=../sequencesender/mocks --outpkg=mocks --structname=RPCInterfaceMock --filename=mock_rpc.go ${COMMON_MOCKERY_PARAMS}
-
-.PHONY: generate-mocks-da
-generate-mocks-da: ## Generates mocks for dataavailability, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../dataavailability --output ../dataavailability/mocks_da --outpkg mocks_da ${COMMON_MOCKERY_PARAMS}
-
-.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=../sequencesender --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: generate-mocks-aggregator	
-generate-mocks-aggregator: ## Generates mocks for aggregator, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=ProverInterface --dir=../aggregator --output=../aggregator/mocks --outpkg=mocks --structname=ProverInterfaceMock --filename=mock_prover.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=Etherman --dir=../aggregator --output=../aggregator/mocks --outpkg=mocks --structname=EthermanMock --filename=mock_etherman.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=StorageInterface --dir=../aggregator --output=../aggregator/mocks --outpkg=mocks --structname=StorageInterfaceMock --filename=mock_storage.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=Synchronizer --srcpkg=github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer --output=../aggregator/mocks --outpkg=mocks --structname=SynchronizerInterfaceMock --filename=mock_synchronizer.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=EthTxManagerClient --dir=../aggregator --output=../aggregator/mocks --outpkg=mocks --structname=EthTxManagerClientMock --filename=mock_eth_tx_manager.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=Txer --dir=../db --output=../aggregator/mocks --outpkg=mocks --structname=TxerMock --filename=mock_txer.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=RPCInterface --dir=../aggregator --output=../aggregator/mocks --outpkg=mocks --structname=RPCInterfaceMock --filename=mock_rpc.go ${COMMON_MOCKERY_PARAMS}
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=AggregatorService_ChannelServer --dir=../aggregator/prover --output=../aggregator/prover/mocks --outpkg=mocks --structname=ChannelMock --filename=mock_channel.go ${COMMON_MOCKERY_PARAMS}
-
-.PHONY: generate-mocks-agglayer
-generate-mocks-agglayer: ## Generates mocks for agglayer, using mockery tool
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --name=AgglayerClientInterface --dir=../agglayer --output=../agglayer --outpkg=agglayer --inpackage --structname=AgglayerClientMock --filename=mock_agglayer_client.go ${COMMON_MOCKERY_PARAMS}	
+generate-mocks:	
+	mockery
 
 .PHONY: test-e2e-fork9-validium
 test-e2e-fork9-validium: stop

diff --git a/test/helpers/mock_ethtxmanager.go b/test/helpers/mock_ethtxmanager.go