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.
This commit is contained in:
M. J. Fromberger
2021-09-22 18:02:24 -07:00
committed by GitHub
parent 7e4cc595d3
commit 41ac5b90c5
6 changed files with 5 additions and 7 deletions

View File

@@ -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

View File

@@ -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.

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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
//