nit(08-wasm): export expected interfaces used as args in functions. (#…

…6889) (#6900) (cherry picked from commit b9681af) Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
cosmos · Jul 22, 2024 · 76c1370 · 76c1370
1 parent 8611530
commit 76c1370
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 26 deletions.
diff --git a/modules/light-clients/08-wasm/keeper/keeper.go b/modules/light-clients/08-wasm/keeper/keeper.go
@@ -15,7 +15,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	clienttypes "github.com/cosmos/ibc-go/v9/modules/core/02-client/types"
 	"github.com/cosmos/ibc-go/v9/modules/core/exported"
@@ -29,7 +28,7 @@ type Keeper struct {
 	cdc          codec.BinaryCodec
 	clientKeeper types.ClientKeeper
 
-	vm ibcwasm.WasmEngine
+	vm types.WasmEngine
 
 	checksums    collections.KeySet[[]byte]
 	storeService store.KVStoreService
@@ -59,7 +58,7 @@ func moduleLogger(ctx sdk.Context) log.Logger {
 }
 
 // GetVM returns the keeper's vm engine.
-func (k Keeper) GetVM() ibcwasm.WasmEngine {
+func (k Keeper) GetVM() types.WasmEngine {
 	return k.vm
 }
 

diff --git a/modules/light-clients/08-wasm/keeper/keeper_no_vm.go b/modules/light-clients/08-wasm/keeper/keeper_no_vm.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
@@ -20,8 +19,8 @@ func NewKeeperWithVM(
 	_ storetypes.KVStoreService,
 	_ types.ClientKeeper,
 	_ string,
-	_ ibcwasm.WasmEngine,
-	_ ibcwasm.QueryRouter,
+	_ types.WasmEngine,
+	_ types.QueryRouter,
 	_ ...Option,
 ) Keeper {
 	panic("not implemented, please build with cgo enabled or nolink_libwasmvm disabled")
@@ -37,7 +36,7 @@ func NewKeeperWithConfig(
 	_ types.ClientKeeper,
 	_ string,
 	_ types.WasmConfig,
-	_ ibcwasm.QueryRouter,
+	_ types.QueryRouter,
 	_ ...Option,
 ) Keeper {
 	panic("not implemented, please build with cgo enabled or nolink_libwasmvm disabled")

diff --git a/modules/light-clients/08-wasm/keeper/keeper_vm.go b/modules/light-clients/08-wasm/keeper/keeper_vm.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
@@ -26,8 +25,8 @@ func NewKeeperWithVM(
 	storeService store.KVStoreService,
 	clientKeeper types.ClientKeeper,
 	authority string,
-	vm ibcwasm.WasmEngine,
-	queryRouter ibcwasm.QueryRouter,
+	vm types.WasmEngine,
+	queryRouter types.QueryRouter,
 	opts ...Option,
 ) Keeper {
 	if clientKeeper == nil {
@@ -86,7 +85,7 @@ func NewKeeperWithConfig(
 	clientKeeper types.ClientKeeper,
 	authority string,
 	wasmConfig types.WasmConfig,
-	queryRouter ibcwasm.QueryRouter,
+	queryRouter types.QueryRouter,
 	opts ...Option,
 ) Keeper {
 	vm, err := wasmvm.NewVM(wasmConfig.DataDir, wasmConfig.SupportedCapabilities, types.ContractMemoryLimit, wasmConfig.ContractDebugMode, types.MemoryCacheSize)

diff --git a/modules/light-clients/08-wasm/keeper/querier.go b/modules/light-clients/08-wasm/keeper/querier.go
@@ -14,7 +14,7 @@ import (
 
 	abci "github.com/cometbft/cometbft/abci/types"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
+	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
 /*
@@ -23,7 +23,7 @@ to handle queries. The global `ibcwasm.QueryPluginsI` points to a `types.QueryPl
 contains two sub-queriers: `types.CustomQuerier` and `types.StargateQuerier`. These sub-queriers
 can be replaced by the user through the options api in the keeper.
 
-In addition, the `types.StargateQuerier` references a global `ibcwasm.QueryRouter` which points
+In addition, the `types.StargateQuerier` references a global `types.QueryRouter` which points
 to `baseapp.GRPCQueryRouter`.
 
 This design is based on wasmd's (v0.50.0) querier plugin design.
@@ -122,7 +122,7 @@ func (e QueryPlugins) HandleQuery(ctx sdk.Context, caller string, request wasmvm
 }
 
 // NewDefaultQueryPlugins returns the default set of query plugins
-func NewDefaultQueryPlugins(queryRouter ibcwasm.QueryRouter) QueryPlugins {
+func NewDefaultQueryPlugins(queryRouter types.QueryRouter) QueryPlugins {
 	return QueryPlugins{
 		Custom:   RejectCustomQuerier(),
 		Stargate: AcceptListStargateQuerier([]string{}, queryRouter),
@@ -131,7 +131,7 @@ func NewDefaultQueryPlugins(queryRouter ibcwasm.QueryRouter) QueryPlugins {
 
 // AcceptListStargateQuerier allows all queries that are in the provided accept list.
 // This function returns protobuf encoded responses in bytes.
-func AcceptListStargateQuerier(acceptedQueries []string, queryRouter ibcwasm.QueryRouter) func(sdk.Context, *wasmvmtypes.StargateQuery) ([]byte, error) {
+func AcceptListStargateQuerier(acceptedQueries []string, queryRouter types.QueryRouter) func(sdk.Context, *wasmvmtypes.StargateQuery) ([]byte, error) {
 	return func(ctx sdk.Context, request *wasmvmtypes.StargateQuery) ([]byte, error) {
 		// append user defined accepted queries to default list defined above.
 		acceptedQueries = append(defaultAcceptList, acceptedQueries...)

diff --git a/modules/light-clients/08-wasm/testing/mock_engine.go b/modules/light-clients/08-wasm/testing/mock_engine.go
@@ -10,14 +10,13 @@ import (
 	wasmvm "github.com/CosmWasm/wasmvm/v2"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/v2/types"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
 const DefaultGasUsed = uint64(1)
 
 var (
-	_ ibcwasm.WasmEngine = (*MockWasmEngine)(nil)
+	_ types.WasmEngine = (*MockWasmEngine)(nil)
 
 	// queryTypes contains all the possible query message types.
 	queryTypes = [...]any{types.StatusMsg{}, types.TimestampAtHeightMsg{}, types.VerifyClientMessageMsg{}, types.CheckForMisbehaviourMsg{}}

diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go
@@ -109,7 +109,6 @@ import (
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	wasm "github.com/cosmos/ibc-go/modules/light-clients/08-wasm"
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	wasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
 	wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	ica "github.com/cosmos/ibc-go/v9/modules/apps/27-interchain-accounts"
@@ -250,7 +249,7 @@ func NewSimApp(
 	traceStore io.Writer,
 	loadLatest bool,
 	appOpts servertypes.AppOptions,
-	mockVM ibcwasm.WasmEngine,
+	mockVM wasmtypes.WasmEngine,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *SimApp {
 	interfaceRegistry, _ := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{

diff --git a/modules/light-clients/08-wasm/testing/simapp/test_helpers.go b/modules/light-clients/08-wasm/testing/simapp/test_helpers.go
@@ -25,10 +25,10 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 	cmttypes "github.com/cometbft/cometbft/types"
 
-	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
+	wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 )
 
-func setup(tb testing.TB, chainID string, withGenesis bool, invCheckPeriod uint, mockVM ibcwasm.WasmEngine) (*SimApp, GenesisState) {
+func setup(tb testing.TB, chainID string, withGenesis bool, invCheckPeriod uint, mockVM wasmtypes.WasmEngine) (*SimApp, GenesisState) {
 	tb.Helper()
 
 	db := dbm.NewMemDB()
@@ -54,7 +54,7 @@ func setup(tb testing.TB, chainID string, withGenesis bool, invCheckPeriod uint,
 }
 
 // SetupWithEmptyStore set up a simapp instance with empty DB
-func SetupWithEmptyStore(tb testing.TB, mockVM ibcwasm.WasmEngine) *SimApp {
+func SetupWithEmptyStore(tb testing.TB, mockVM wasmtypes.WasmEngine) *SimApp {
 	tb.Helper()
 
 	app, _ := setup(tb, "", false, 0, mockVM)
@@ -65,7 +65,7 @@ func SetupWithEmptyStore(tb testing.TB, mockVM ibcwasm.WasmEngine) *SimApp {
 // that also act as delegators. For simplicity, each validator is bonded with a delegation
 // of one consensus engine unit in the default token of the simapp from first genesis
 // account. A Nop logger is set in SimApp.
-func SetupWithGenesisValSetSnapshotter(t *testing.T, mockVM ibcwasm.WasmEngine, valSet *cmttypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp {
+func SetupWithGenesisValSetSnapshotter(t *testing.T, mockVM wasmtypes.WasmEngine, valSet *cmttypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp {
 	t.Helper()
 
 	app, genesisState := setup(t, "", true, 5, mockVM)
@@ -87,7 +87,7 @@ func SetupWithGenesisValSetSnapshotter(t *testing.T, mockVM ibcwasm.WasmEngine,
 }
 
 // SetupWithSnapshotter initializes a new SimApp with a configured snapshot db. A Nop logger is set in SimApp.
-func SetupWithSnapshotter(t *testing.T, mockVM ibcwasm.WasmEngine) *SimApp {
+func SetupWithSnapshotter(t *testing.T, mockVM wasmtypes.WasmEngine) *SimApp {
 	t.Helper()
 
 	privVal := cmttypes.NewMockPV()

diff --git a/...m/internal/ibcwasm/expected_interfaces.go → ...ents/08-wasm/types/expected_interfaces.go b/...m/internal/ibcwasm/expected_interfaces.go → ...ents/08-wasm/types/expected_interfaces.go
@@ -1,4 +1,4 @@
-package ibcwasm
+package types
 
 import (
 	wasmvm "github.com/CosmWasm/wasmvm/v2"

diff --git a/...ients/08-wasm/internal/ibcwasm/wasm_vm.go → ...es/light-clients/08-wasm/types/wasm_vm.go b/...ients/08-wasm/internal/ibcwasm/wasm_vm.go → ...es/light-clients/08-wasm/types/wasm_vm.go
@@ -1,6 +1,6 @@
 //go:build cgo && !nolink_libwasmvm
 
-package ibcwasm
+package types
 
 import wasmvm "github.com/CosmWasm/wasmvm/v2"