Merge pull request #5839 from Lemma199/ci-generated-mock-check

Ensure generated CI mocks are up to date
ethereum-optimism · Jun 8, 2023 · 5e3219c · 5e3219c
2 parents 963500e + 5fe5f53
commit 5e3219c
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -738,7 +738,6 @@ jobs:
           environment:
             CI: true
 
-
   go-lint:
     parameters:
       module:
@@ -1147,6 +1146,28 @@ jobs:
           event: fail
           template: basic_fail_1
 
+  check-generated-mocks-op-node:
+    docker:
+      - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
+    steps:
+      - checkout
+      - check-changed:
+          patterns: op-node
+      - run:
+          name: check-generated-mocks
+          command: make generate-mocks-op-node && git diff --exit-code
+
+  check-generated-mocks-op-service:
+    docker:
+      - image: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest
+    steps:
+      - checkout
+      - check-changed:
+          patterns: op-service
+      - run:
+          name: check-generated-mocks
+          command: make generate-mocks-op-service && git diff --exit-code
+
 workflows:
   main:
     jobs:
@@ -1527,6 +1548,8 @@ workflows:
             - op-batcher-docker-build
             - op-proposer-docker-build
             - op-challenger-docker-build
+      - check-generated-mocks-op-node
+      - check-generated-mocks-op-service
   release:
     jobs:
       - hold:

diff --git a/Makefile b/Makefile
@@ -32,6 +32,14 @@ op-node:
 	make -C ./op-node op-node
 .PHONY: op-node
 
+generate-mocks-op-node:
+	make -C ./op-node generate-mocks
+.PHONY: generate-mocks-op-node
+
+generate-mocks-op-service:
+	make -C ./op-service generate-mocks
+.PHONY: generate-mocks-op-service
+
 op-batcher:
 	make -C ./op-batcher op-batcher
 .PHONY: op-batcher

diff --git a/op-node/Makefile b/op-node/Makefile
@@ -37,10 +37,13 @@ fuzz:
 	go test -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzRejectCreateBlockBadTimestamp ./rollup/driver
 	go test -run NOTAREALTEST -v -fuzztime 10s -fuzz FuzzDecodeDepositTxDataToL1Info ./rollup/driver
 
+generate-mocks:
+	go generate ./...
 
 .PHONY: \
 	op-node \
 	clean \
 	test \
 	lint \
-	fuzz
+	fuzz \
+	generate-mocks
diff --git a/op-node/p2p/gating/mocks/BlockingConnectionGater.go b/op-node/p2p/gating/mocks/BlockingConnectionGater.go
diff --git a/op-node/p2p/gating/mocks/ExpiryStore.go b/op-node/p2p/gating/mocks/ExpiryStore.go
diff --git a/op-node/p2p/gating/mocks/Scores.go b/op-node/p2p/gating/mocks/Scores.go
diff --git a/op-node/p2p/mocks/GossipMetricer.go b/op-node/p2p/mocks/GossipMetricer.go
diff --git a/op-node/p2p/mocks/Peerstore.go b/op-node/p2p/mocks/Peerstore.go
diff --git a/op-node/p2p/mocks/ScoreMetrics.go b/op-node/p2p/mocks/ScoreMetrics.go
diff --git a/op-node/p2p/monitor/mocks/PeerManager.go b/op-node/p2p/monitor/mocks/PeerManager.go
diff --git a/op-service/Makefile b/op-service/Makefile
@@ -4,6 +4,10 @@ test:
 lint:
 	golangci-lint run -E asciicheck,goimports,misspell ./...
 
+generate-mocks:
+	go generate ./...
+
 .PHONY: \
 	test \
-	lint
+	lint \
+	generate-mocks
diff --git a/op-service/txmgr/mocks/TxManager.go b/op-service/txmgr/mocks/TxManager.go