make mock fix (#12328)

for #11113
erigontech · Oct 19, 2024 · 617a3de · 617a3de
1 parent 2f9a3a3
commit 617a3de
Show file tree

Hide file tree

Showing 46 changed files with 1,176 additions and 937 deletions.
diff --git a/Makefile b/Makefile
@@ -211,21 +211,17 @@ clean:
 devtools:
 	# Notice! If you adding new binary - add it also to tools.go file
 	$(GOBUILD) -o $(GOBIN)/gencodec github.com/fjl/gencodec
-	$(GOBUILD) -o $(GOBIN)/mockgen go.uber.org/mock/mockgen
 	$(GOBUILD) -o $(GOBIN)/abigen ./cmd/abigen
 	@type "npm" 2> /dev/null || echo 'Please install node.js and npm'
 	@type "solc" 2> /dev/null || echo 'Please install solc'
 	@type "protoc" 2> /dev/null || echo 'Please install protoc'
 
 ## mocks:                             generate test mocks
-mocks: mocks-clean
-	@cd erigon-lib && $(MAKE) mocks
-	$(GOBUILD) -o $(GOBIN)/mockgen go.uber.org/mock/mockgen
-	PATH="$(GOBIN):$(PATH)" go generate -run "mockgen" ./...
-
-## mocks-clean:                       cleans all generated test mocks
-mocks-clean:
+mocks:
+	rm -f $(GOBIN)/mockgen
+	$(GOBUILD) -o "$(GOBIN)/mockgen" go.uber.org/mock/mockgen
 	grep -r -l --exclude-dir="erigon-lib" --exclude-dir="tests" --exclude-dir="*$(GOBINREL)*" "^// Code generated by MockGen. DO NOT EDIT.$$" . | xargs rm -r
+	PATH="$(GOBIN):$(PATH)" go generate -run "mockgen" ./...
 
 ## solc:                              generate all solidity contracts
 solc:

diff --git a/cl/abstract/mock_services/beacon_state_mutator_mock.go b/cl/abstract/mock_services/beacon_state_mutator_mock.go
diff --git a/cl/abstract/mock_services/beacon_state_reader_mock.go b/cl/abstract/mock_services/beacon_state_reader_mock.go
diff --git a/cl/aggregation/mock_services/aggregation_pool_mock.go b/cl/aggregation/mock_services/aggregation_pool_mock.go
diff --git a/cl/beacon/builder/mock_services/builder_client_mock.go b/cl/beacon/builder/mock_services/builder_client_mock.go
diff --git a/cl/beacon/synced_data/mock_services/synced_data_mock.go b/cl/beacon/synced_data/mock_services/synced_data_mock.go