Browse Source

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.
pull/6977/head
M. J. Fromberger 3 years ago
committed by GitHub
parent
commit
41ac5b90c5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 7 deletions
  1. +1
    -1
      internal/proxy/app_conn.go
  2. +1
    -1
      internal/state/indexer/eventsink.go
  3. +0
    -1
      internal/state/mocks/evidence_pool.go
  4. +0
    -1
      internal/state/mocks/store.go
  5. +2
    -2
      internal/state/services.go
  6. +1
    -1
      internal/state/store.go

+ 1
- 1
internal/proxy/app_conn.go View File

@ -7,7 +7,7 @@ import (
"github.com/tendermint/tendermint/abci/types" "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 // Enforce which abci msgs can be sent on a connection at the type level


+ 1
- 1
internal/state/indexer/eventsink.go View File

@ -16,7 +16,7 @@ const (
PSQL EventSinkType = "psql" 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, // EventSink interface is defined the APIs for the IndexerService to interact with the data store,
// including the block/transaction indexing and the search functions. // including the block/transaction indexing and the search functions.


+ 0
- 1
internal/state/mocks/evidence_pool.go View File

@ -5,7 +5,6 @@ package mocks
import ( import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
state "github.com/tendermint/tendermint/internal/state" state "github.com/tendermint/tendermint/internal/state"
types "github.com/tendermint/tendermint/types" types "github.com/tendermint/tendermint/types"
) )


+ 0
- 1
internal/state/mocks/store.go View File

@ -5,7 +5,6 @@ package mocks
import ( import (
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
state "github.com/tendermint/tendermint/internal/state" state "github.com/tendermint/tendermint/internal/state"
tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state" tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state"
types "github.com/tendermint/tendermint/types" types "github.com/tendermint/tendermint/types"


+ 2
- 2
internal/state/services.go View File

@ -9,7 +9,7 @@ import (
// NOTE: Interfaces used by RPC must be thread safe! // NOTE: Interfaces used by RPC must be thread safe!
//------------------------------------------------------ //------------------------------------------------------
//go:generate ../scripts/mockery_generate.sh BlockStore
//go:generate ../../scripts/mockery_generate.sh BlockStore
//------------------------------------------------------ //------------------------------------------------------
// blockstore // blockstore
@ -38,7 +38,7 @@ type BlockStore interface {
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// evidence pool // evidence pool
//go:generate ../scripts/mockery_generate.sh EvidencePool
//go:generate ../../scripts/mockery_generate.sh EvidencePool
// EvidencePool defines the EvidencePool interface used by State. // EvidencePool defines the EvidencePool interface used by State.
type EvidencePool interface { type EvidencePool interface {


+ 1
- 1
internal/state/store.go 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 // Store defines the state store interface
// //


Loading…
Cancel
Save