fix mockery generation script (#9094) (#9114)

tendermint · Jul 30, 2022 · 0846f3e · 0846f3e
1 parent 46badfa
commit 0846f3e
Show file tree

Hide file tree

Showing 27 changed files with 81 additions and 50 deletions.
diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
@@ -7,7 +7,7 @@ name: Check generated code
 on:
   pull_request:
     branches:
-      - v0.34.x
+      - main
 
 permissions:
   contents: read

diff --git a/Makefile b/Makefile
@@ -74,9 +74,9 @@ install:
 ###                                Mocks                                    ###
 ###############################################################################
 
-mockery: 
+mockery:
 	go generate -run="./scripts/mockery_generate.sh" ./...
-.PHONY: mockery 
+.PHONY: mockery
 
 ###############################################################################
 ###                                Protobuf                                 ###

diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go
diff --git a/evidence/services.go b/evidence/services.go
@@ -4,7 +4,7 @@ import (
 	"github.com/tendermint/tendermint/types"
 )
 
-//go:generate mockery --case underscore --name BlockStore
+//go:generate ../scripts/mockery_generate.sh BlockStore
 
 type BlockStore interface {
 	LoadBlockMeta(height int64) *types.BlockMeta

diff --git a/light/rpc/client.go b/light/rpc/client.go
@@ -27,7 +27,7 @@ var errNegOrZeroHeight = errors.New("negative or zero height")
 type KeyPathFunc func(path string, key []byte) (merkle.KeyPath, error)
 
 // LightClient is an interface that contains functionality needed by Client from the light client.
-//go:generate mockery --case underscore --name LightClient
+//go:generate ../../scripts/mockery_generate.sh LightClient
 type LightClient interface {
 	ChainID() string
 	Update(ctx context.Context, now time.Time) (*types.LightBlock, error)

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/p2p/peer.go b/p2p/peer.go
@@ -12,7 +12,7 @@ import (
 	tmconn "github.com/tendermint/tendermint/p2p/conn"
 )
 
-//go:generate mockery --case underscore --name Peer
+//go:generate ../scripts/mockery_generate.sh Peer
 
 const metricsTickerDuration = 10 * time.Second
 

diff --git a/proxy/app_conn.go b/proxy/app_conn.go
@@ -5,7 +5,7 @@ import (
 	"github.com/tendermint/tendermint/abci/types"
 )
 
-//go:generate mockery --case underscore --name AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot
+//go:generate ../scripts/mockery_generate.sh AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot
 
 //----------------------------------------------------------------------------------------
 // Enforce which abci msgs can be sent on a connection at the type level

diff --git a/proxy/client.go b/proxy/client.go
@@ -11,6 +11,8 @@ import (
 	e2e "github.com/tendermint/tendermint/test/e2e/app"
 )
 
+//go:generate ../scripts/mockery_generate.sh ClientCreator
+
 // ClientCreator creates new ABCI clients.
 type ClientCreator interface {
 	// NewABCIClient returns a new ABCI client.

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
@@ -0,0 +1,15 @@
+#!/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 "$@"
diff --git a/state/indexer/block.go b/state/indexer/block.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/types"
 )
 
-//go:generate mockery --case underscore --name BlockIndexer
+//go:generate ../../scripts/mockery_generate.sh BlockIndexer
 
 // BlockIndexer defines an interface contract for indexing block events.
 type BlockIndexer interface {

diff --git a/state/indexer/mocks/block_indexer.go b/state/indexer/mocks/block_indexer.go
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/state/services.go b/state/services.go
@@ -12,7 +12,7 @@ import (
 //------------------------------------------------------
 // blockstore
 
-//go:generate mockery --case underscore --name BlockStore
+//go:generate ../scripts/mockery_generate.sh BlockStore
 
 // BlockStore defines the interface used by the ConsensusState.
 type BlockStore interface {
@@ -38,7 +38,7 @@ type BlockStore interface {
 //-----------------------------------------------------------------------------
 // evidence pool
 
-//go:generate mockery --case underscore --name EvidencePool
+//go:generate ../scripts/mockery_generate.sh EvidencePool
 
 // EvidencePool defines the EvidencePool interface used by State.
 type EvidencePool interface {

diff --git a/state/store.go b/state/store.go
@@ -39,7 +39,7 @@ func calcABCIResponsesKey(height int64) []byte {
 
 //----------------------
 
-//go:generate mockery --case underscore --name Store
+//go:generate ../scripts/mockery_generate.sh Store
 
 // Store defines the state store interface
 //

diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go
@@ -10,7 +10,7 @@ import (
 
 // XXX/TODO: These types should be moved to the indexer package.
 
-//go:generate mockery --case underscore --name TxIndexer
+//go:generate ../../scripts/mockery_generate.sh TxIndexer
 
 // TxIndexer interface defines methods to index and search transactions.
 type TxIndexer interface {

diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go