retiring(transaction): decode transaction request, used for wasm

Signed-off-by: Deepanshu Tripathi <[email protected]>

helpers/base/transaction.go

@@ -5,7 +5,6 @@ package base
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/AssetMantle/modules/helpers"
 	"github.com/AssetMantle/modules/utilities/rest"
@@ -16,12 +15,11 @@ import (
 	codecTypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	sdkModuleTypes "github.com/cosmos/cosmos-sdk/types/module"
+	"net/http"
 	"strings"
 
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
-	"net/http"
-	"reflect"
 )
 
 type transaction struct {
@@ -79,13 +77,13 @@ func (transaction transaction) HandleMessage(context context.Context, message he
 }
 func (transaction transaction) RESTRequestHandler(context client.Context) http.HandlerFunc {
 	return func(responseWriter http.ResponseWriter, httpRequest *http.Request) {
-		transactionRequest := transaction.requestPrototype()
-		if !rest.ReadRESTReq(responseWriter, httpRequest, context.LegacyAmino, &transactionRequest) {
-			return
-		} else if reflect.TypeOf(transaction.requestPrototype()) != reflect.TypeOf(transactionRequest) {
-			rest.CheckBadRequestError(responseWriter, fmt.Errorf("expected %s, got %s", reflect.TypeOf(transaction.requestPrototype()), reflect.TypeOf(transactionRequest)))
+		transactionRequest, err := transaction.requestPrototype().FromHTTPRequest(httpRequest)
+		if err != nil {
+			rest.CheckBadRequestError(responseWriter, err)
 			return
-		} else if rest.CheckBadRequestError(responseWriter, transactionRequest.Validate()) {
+		}
+
+		if rest.CheckBadRequestError(responseWriter, transactionRequest.Validate()) {
 			return
 		}
 
@@ -117,14 +115,6 @@ func (transaction transaction) RegisterService(configurator sdkModuleTypes.Confi
 	}
 	transaction.serviceRegistrar(configurator.MsgServer(), transaction.keeper)
 }
-func (transaction transaction) DecodeTransactionRequest(rawMessage json.RawMessage) (sdkTypes.Msg, error) {
-	transactionRequest, err := transaction.requestPrototype().FromJSON(rawMessage)
-	if err != nil {
-		return nil, err
-	}
-
-	return transactionRequest.MakeMsg()
-}
 func (transaction transaction) InitializeKeeper(mapper helpers.Mapper, parameterManager helpers.ParameterManager, auxiliaryKeepers ...interface{}) helpers.Transaction {
 	transaction.keeper = transaction.keeperPrototype().Initialize(mapper, parameterManager, auxiliaryKeepers).(helpers.TransactionKeeper)
 	return transaction

helpers/transaction.go

@@ -5,7 +5,6 @@ package helpers
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 
 	"github.com/cosmos/cosmos-sdk/client"
@@ -24,6 +23,5 @@ type Transaction interface {
 	RegisterLegacyAminoCodec(amino *codec.LegacyAmino)
 	RegisterInterfaces(types.InterfaceRegistry)
 	RegisterService(module.Configurator)
-	DecodeTransactionRequest(json.RawMessage) (sdkTypes.Msg, error)
 	InitializeKeeper(Mapper, ParameterManager, ...interface{}) Transaction
 }