fix: remove duplicated recipes in test/makefile

0xPolygon · Dec 20, 2024 · 619be32 · 619be32
1 parent 7385f1a
commit 619be32
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 124 deletions.
diff --git a/bridgesync/mocks/bridge_contractor.go b/bridgesync/mocks/bridge_contractor.go
diff --git a/l1infotreesync/mocks/eth_clienter.go b/l1infotreesync/mocks/eth_clienter.go
diff --git a/test/Makefile b/test/Makefile
@@ -1,14 +1,14 @@
 .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-l1infotreesync generate-mocks-aggregator \
-	generate-mocks-aggsender generate-mocks-agglayer generate-mocks-bridgesync
-	generate-mocks-sync generate-mocks-l1infotreesync generate-mocks-aggregator \
-	generate-mocks-aggsender generate-mocks-agglayer generate-mocks-bridgesync
+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-aggsender 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 --name=EthClienter --dir=../bridgesync --output=../bridgesync --outpkg=bridgesync --inpackage --structname=L2Mock --filename=mock_l2_test.go
+	rm -Rf ../bridgesync/mocks
+	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
@@ -39,10 +39,14 @@ generate-mocks-l1infotreesync: ## Generates mocks for l1infotreesync, using mock
 	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
 
-.PHONY: generate-mocks-aggoracle
-generate-mocks-helpers: ## Generates mocks for helpers , using mockery tool
+.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
 
+.PHONY: generate-mocks-aggoracle
+generate-mocks-aggoracle: ## Generates mocks for aggoracle, using mockery tool
+	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --dir ../aggoracle/chaingersender --output ../aggoracle/chaingersender/mocks --outpkg mocks ${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}
@@ -70,13 +74,7 @@ generate-mocks-aggsender: ## Generates mocks for aggsender, using mockery tool
 
 .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}
-
-.PHONY: generate-mocks-bridgesync
-generate-mocks-bridgesync: ## Generates mocks for bridgesync, using mockery tool
-	rm -Rf ../bridgesync/mocks
-	export "GOROOT=$$(go env GOROOT)" && $$(go env GOPATH)/bin/mockery --all --case snake --dir ../bridgesync --output ../bridgesync/mocks --outpkg mocks_bridgesync ${COMMON_MOCKERY_PARAMS}
-
+	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}	
 
 .PHONY: test-e2e-fork9-validium
 test-e2e-fork9-validium: stop

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