fix: disable custom querier

Finschia · Feb 26, 2024 · f58f7ba · f58f7ba
1 parent 0b88522
commit f58f7ba
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 47 deletions.
diff --git a/x/wasm/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go
@@ -106,7 +106,7 @@ func DefaultQueryPlugins(
 ) QueryPlugins {
 	return QueryPlugins{
 		Bank:     BankQuerier(bank),
-		Custom:   CustomQuerierImpl(queryRouter),
+		Custom:   NoCustomQuerier,
 		IBC:      IBCQuerier(wasm, channelKeeper),
 		Staking:  StakingQuerier(staking, distKeeper),
 		Stargate: RejectStargateQuerier(),
@@ -209,30 +209,6 @@ func NoCustomQuerier(sdk.Context, json.RawMessage) ([]byte, error) {
 	return nil, wasmvmtypes.UnsupportedRequest{Kind: "custom"}
 }
 
-func CustomQuerierImpl(queryRouter GRPCQueryRouter) func(ctx sdk.Context, querierJson json.RawMessage) ([]byte, error) {
-	return func(ctx sdk.Context, querierJson json.RawMessage) ([]byte, error) {
-		var linkQueryWrapper types.LinkQueryWrapper
-		err := json.Unmarshal(querierJson, &linkQueryWrapper)
-		if err != nil {
-			return nil, err
-		}
-		route := queryRouter.Route(linkQueryWrapper.Path)
-		if route == nil {
-			return nil, wasmvmtypes.UnsupportedRequest{Kind: "Unknown encode module"}
-		}
-		req := abci.RequestQuery{
-			Data: linkQueryWrapper.Data,
-			Path: linkQueryWrapper.Path,
-		}
-		res, err := route(ctx, req)
-		if err != nil {
-			return nil, err
-		}
-
-		return res.Value, nil
-	}
-}
-
 func IBCQuerier(wasm contractMetaDataSource, channelKeeper types.ChannelKeeper) func(ctx sdk.Context, caller sdk.AccAddress, request *wasmvmtypes.IBCQuery) ([]byte, error) {
 	return func(ctx sdk.Context, caller sdk.AccAddress, request *wasmvmtypes.IBCQuery) ([]byte, error) {
 		if request.PortID != nil {

diff --git a/x/wasm/types/encoder.go b/x/wasm/types/encoder.go