From 41ac5b90c58bcac266a9fca2d8775de04004c4e2 Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@interchain.io>
Date: Wed, 22 Sep 2021 18:02:24 -0700
Subject: [PATCH] Fix script paths in go:generate directives. (#6973)

We moved some files further down in the directory structure in #6964, which
caused the relative paths to the mockery wrapper to stop working.

There does not seem to be an obvious way to get the module root as a default
environment variable, so for now I just added the extra up-slashes.
---
 internal/proxy/app_conn.go            | 2 +-
 internal/state/indexer/eventsink.go   | 2 +-
 internal/state/mocks/evidence_pool.go | 1 -
 internal/state/mocks/store.go         | 1 -
 internal/state/services.go            | 4 ++--
 internal/state/store.go               | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/internal/proxy/app_conn.go b/internal/proxy/app_conn.go
index 39860e2a2..ca2c7c109 100644
--- a/internal/proxy/app_conn.go
+++ b/internal/proxy/app_conn.go
@@ -7,7 +7,7 @@ import (
 	"github.com/tendermint/tendermint/abci/types"
 )
 
-//go:generate ../scripts/mockery_generate.sh 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/internal/state/indexer/eventsink.go b/internal/state/indexer/eventsink.go
index d7c9d10e0..dba50b6af 100644
--- a/internal/state/indexer/eventsink.go
+++ b/internal/state/indexer/eventsink.go
@@ -16,7 +16,7 @@ const (
 	PSQL EventSinkType = "psql"
 )
 
-//go:generate ../../scripts/mockery_generate.sh EventSink
+//go:generate ../../../scripts/mockery_generate.sh EventSink
 
 // EventSink interface is defined the APIs for the IndexerService to interact with the data store,
 // including the block/transaction indexing and the search functions.
diff --git a/internal/state/mocks/evidence_pool.go b/internal/state/mocks/evidence_pool.go
index 9f5e747e5..8bf4a9b64 100644
--- a/internal/state/mocks/evidence_pool.go
+++ b/internal/state/mocks/evidence_pool.go
@@ -5,7 +5,6 @@ package mocks
 import (
 	mock "github.com/stretchr/testify/mock"
 	state "github.com/tendermint/tendermint/internal/state"
-
 	types "github.com/tendermint/tendermint/types"
 )
 
diff --git a/internal/state/mocks/store.go b/internal/state/mocks/store.go
index af2408dd9..4452f9bec 100644
--- a/internal/state/mocks/store.go
+++ b/internal/state/mocks/store.go
@@ -5,7 +5,6 @@ package mocks
 import (
 	mock "github.com/stretchr/testify/mock"
 	state "github.com/tendermint/tendermint/internal/state"
-
 	tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state"
 
 	types "github.com/tendermint/tendermint/types"
diff --git a/internal/state/services.go b/internal/state/services.go
index c692d0b94..49388cc12 100644
--- a/internal/state/services.go
+++ b/internal/state/services.go
@@ -9,7 +9,7 @@ import (
 // NOTE: Interfaces used by RPC must be thread safe!
 //------------------------------------------------------
 
-//go:generate ../scripts/mockery_generate.sh BlockStore
+//go:generate ../../scripts/mockery_generate.sh BlockStore
 
 //------------------------------------------------------
 // blockstore
@@ -38,7 +38,7 @@ type BlockStore interface {
 //-----------------------------------------------------------------------------
 // evidence pool
 
-//go:generate ../scripts/mockery_generate.sh EvidencePool
+//go:generate ../../scripts/mockery_generate.sh EvidencePool
 
 // EvidencePool defines the EvidencePool interface used by State.
 type EvidencePool interface {
diff --git a/internal/state/store.go b/internal/state/store.go
index 5ce11e47d..787b5c8ad 100644
--- a/internal/state/store.go
+++ b/internal/state/store.go
@@ -68,7 +68,7 @@ func init() {
 
 //----------------------
 
-//go:generate ../scripts/mockery_generate.sh Store
+//go:generate ../../scripts/mockery_generate.sh Store
 
 // Store defines the state store interface
 //