From c16bad6427d9609ca8e3b6b222e3ad8c66c9ff68 Mon Sep 17 00:00:00 2001
From: Alex Peters <alpe@users.noreply.github.com>
Date: Thu, 19 Jan 2023 13:35:01 +0100
Subject: [PATCH] Apply updates; formatting

---
 x/wasm/client/cli/query_lib_version.go        | 1 +
 x/wasm/client/cli/query_lib_version_no_cgo.go | 1 +
 x/wasm/keeper/keeper_cgo.go                   | 5 +++--
 x/wasm/keeper/keeper_no_cgo.go                | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/x/wasm/client/cli/query_lib_version.go b/x/wasm/client/cli/query_lib_version.go
index d087aa47d3..5bf0cea8ba 100644
--- a/x/wasm/client/cli/query_lib_version.go
+++ b/x/wasm/client/cli/query_lib_version.go
@@ -25,6 +25,7 @@ func GetCmdLibVersion() *cobra.Command {
 			fmt.Println(version)
 			return nil
 		},
+		SilenceUsage: true,
 	}
 	return cmd
 }
diff --git a/x/wasm/client/cli/query_lib_version_no_cgo.go b/x/wasm/client/cli/query_lib_version_no_cgo.go
index 5c437b6872..ba1873831d 100644
--- a/x/wasm/client/cli/query_lib_version_no_cgo.go
+++ b/x/wasm/client/cli/query_lib_version_no_cgo.go
@@ -19,6 +19,7 @@ func GetCmdLibVersion() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf("not implemented, please build with cgo enabled")
 		},
+		SilenceUsage: true,
 	}
 	return cmd
 }
diff --git a/x/wasm/keeper/keeper_cgo.go b/x/wasm/keeper/keeper_cgo.go
index 27a28eec20..06a0ccabe6 100644
--- a/x/wasm/keeper/keeper_cgo.go
+++ b/x/wasm/keeper/keeper_cgo.go
@@ -5,11 +5,12 @@ package keeper
 import (
 	"path/filepath"
 
-	"github.com/CosmWasm/wasmd/x/wasm/types"
 	wasmvm "github.com/CosmWasm/wasmvm"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
+
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // NewKeeper creates a new contract Keeper instance
@@ -58,7 +59,7 @@ func NewKeeper(
 		maxQueryStackSize:    types.DefaultMaxQueryStackSize,
 		acceptedAccountTypes: defaultAcceptedAccountTypes,
 	}
-	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distKeeper, channelKeeper, queryRouter, keeper)
+	keeper.wasmVMQueryHandler = DefaultQueryPlugins(bankKeeper, stakingKeeper, distKeeper, channelKeeper, keeper)
 	for _, o := range opts {
 		o.apply(keeper)
 	}
diff --git a/x/wasm/keeper/keeper_no_cgo.go b/x/wasm/keeper/keeper_no_cgo.go
index c4a92d7c6b..196b9ee1ee 100644
--- a/x/wasm/keeper/keeper_no_cgo.go
+++ b/x/wasm/keeper/keeper_no_cgo.go
@@ -3,10 +3,11 @@
 package keeper
 
 import (
-	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
+
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 // NewKeeper creates a new contract Keeper instance