tools: remove mockery from tools.go (#9196)

The `mockery` project recommends against using a binary of `mockery` that has been created using `go install`. vektra/mockery#456. Developers of Tendermint wishing to generate mocks should avoid having a version of `mockery` on their path that does not match the version listed in [mockery_generate.sh](https://github.com/tendermint/tendermint/blob/10e1ac8feabd8ce7fd560ebecb11b929376fcb9c/scripts/mockery_generate.sh#L11). To make this easier for developers, the `mockery_generate.sh` script uses a containerized copy of `mockery` if `mockery` is not present on the developer's `PATH`. This containerized version of `mockery` uses the same version of mockery as our CI pipelines and allows all developers to automatically use the same version without having to manage it themselves. - [ ] Tests written/updated, or no tests needed - [ ] `CHANGELOG_PENDING.md` updated, or no changelog entry needed - [ ] Updated relevant documentation (`docs/`) and code comments, or no documentation updates needed
tendermint · Aug 16, 2022 · cd64622 · cd64622
1 parent d7ee791
commit cd64622
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 40 deletions.
diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
@@ -26,8 +26,6 @@ jobs:
         run: |
           set -euo pipefail
 
-          readonly MOCKERY=2.12.3  # N.B. no leading "v"
-          curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
           make mockery 2>/dev/null
 
           if ! git diff --stat --exit-code ; then

diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go
diff --git a/go.mod b/go.mod
@@ -47,10 +47,12 @@ require (
 	github.com/pointlander/peg v1.0.1
 	github.com/prometheus/common v0.37.0
 	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
-	github.com/vektra/mockery/v2 v2.14.0
 )
 
-require github.com/prometheus/client_model v0.2.0
+require (
+	github.com/prometheus/client_model v0.2.0
+	github.com/vektra/mockery/v2 v2.14.0
+)
 
 require (
 	4d63.com/gochecknoglobals v0.1.0 // indirect
@@ -111,7 +113,7 @@ require (
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gofrs/uuid v4.2.0+incompatible // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/snappy v0.0.1 // indirect
+	github.com/golang/snappy v0.0.3 // indirect
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
 	github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect

diff --git a/go.sum b/go.sum
@@ -384,8 +384,9 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=

diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go
diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go
diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go
diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go
diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go
diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go
diff --git a/proxy/mocks/client_creator.go b/proxy/mocks/client_creator.go
diff --git a/scripts/mockery_generate.sh b/scripts/mockery_generate.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 #
 # Invoke Mockery v2 to update generated mocks for the given type.
-#
-# This script runs a locally-installed "mockery" if available, otherwise it
-# runs the published Docker container. This legerdemain is so that the CI build
-# and a local build can work off the same script.
-#
-if ! which mockery ; then
-  mockery() {
-    docker run --rm -v "$PWD":/w --workdir=/w vektra/mockery:v2.12.3
-  }
-fi
 
-mockery --disable-version-string --case underscore --name "$@"
+go run github.com/vektra/mockery/v2 --disable-version-string --case underscore --name "$*"
+
diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go
diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go
diff --git a/state/mocks/store.go b/state/mocks/store.go
diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go