Wire up bank tx REST routes

cosmos · Apr 28, 2020 · d0cd45a · d0cd45a
1 parent 026a8ea
commit d0cd45a
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 27 deletions.
diff --git a/client/tx/tx.go b/client/tx/tx.go
@@ -124,9 +124,7 @@ func BroadcastTx(ctx context.CLIContext, txf Factory, msgs ...sdk.Msg) error {
 // WriteGeneratedTxResponse writes a generated unsigned transaction to the
 // provided http.ResponseWriter. It will simulate gas costs if requested by the
 // BaseReq. Upon any error, the error will be written to the http.ResponseWriter.
-func WriteGeneratedTxResponse(
-	ctx context.CLIContext, w http.ResponseWriter, txg context.TxGenerator, br rest.BaseReq, msgs ...sdk.Msg,
-) {
+func WriteGeneratedTxResponse(ctx context.CLIContext, w http.ResponseWriter, br rest.BaseReq, msgs ...sdk.Msg) {
 
 	gasAdj, ok := rest.ParseFloat64OrReturnBadRequest(w, br.GasAdjustment, flags.DefaultGasAdjustment)
 	if !ok {
@@ -145,7 +143,8 @@ func WriteGeneratedTxResponse(
 		WithGasAdjustment(gasAdj).
 		WithMemo(br.Memo).
 		WithChainID(br.ChainID).
-		WithSimulateAndExecute(br.Simulate)
+		WithSimulateAndExecute(br.Simulate).
+		WithTxGenerator(ctx.TxGenerator)
 
 	if br.Simulate || simAndExec {
 		if gasAdj < 0 {

diff --git a/types/module/client.go b/types/module/client.go
@@ -1,11 +1,14 @@
 package module
 
 import (
-	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
 )
 
 type ClientModule interface {
 	NewTxCmd(ctx context.CLIContext) *cobra.Command
 	NewQueryCmd(ctx context.CLIContext) *cobra.Command
+	NewRESTRoutes(ctx context.CLIContext, rtr *mux.Router)
 }
diff --git a/x/bank/client/rest/rest.go b/x/bank/client/rest/rest.go
@@ -4,13 +4,12 @@ import (
 	"github.com/gorilla/mux"
 
 	"github.com/cosmos/cosmos-sdk/client/context"
-	"github.com/cosmos/cosmos-sdk/codec"
 )
 
 // RegisterHandlers registers all x/bank transaction and query HTTP REST handlers
 // on the provided mux router.
-func RegisterHandlers(ctx context.CLIContext, m codec.Marshaler, txg context.TxGenerator, r *mux.Router) {
-	r.HandleFunc("/bank/accounts/{address}/transfers", NewSendRequestHandlerFn(ctx, m, txg)).Methods("POST")
+func RegisterHandlers(ctx context.CLIContext, r *mux.Router) {
+	r.HandleFunc("/bank/accounts/{address}/transfers", NewSendRequestHandlerFn(ctx)).Methods("POST")
 	r.HandleFunc("/bank/balances/{address}", QueryBalancesRequestHandlerFn(ctx)).Methods("GET")
 }
 

diff --git a/x/bank/client/rest/tx.go b/x/bank/client/rest/tx.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client/context"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"
 	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
@@ -22,10 +21,8 @@ type SendReq struct {
 
 // NewSendRequestHandlerFn returns an HTTP REST handler for creating a MsgSend
 // transaction.
-func NewSendRequestHandlerFn(ctx context.CLIContext, m codec.Marshaler, txg context.TxGenerator) http.HandlerFunc {
+func NewSendRequestHandlerFn(ctx context.CLIContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		ctx = ctx.WithMarshaler(m)
-
 		vars := mux.Vars(r)
 		bech32Addr := vars["address"]
 
@@ -50,7 +47,7 @@ func NewSendRequestHandlerFn(ctx context.CLIContext, m codec.Marshaler, txg cont
 		}
 
 		msg := types.NewMsgSend(fromAddr, toAddr, req.Amount)
-		tx.WriteGeneratedTxResponse(ctx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(ctx, w, req.BaseReq, msg)
 	}
 }
 

diff --git a/x/bank/module.go b/x/bank/module.go
@@ -175,3 +175,7 @@ func (am AppModuleBasic) NewTxCmd(ctx context.CLIContext) *cobra.Command {
 func (am AppModuleBasic) NewQueryCmd(ctx context.CLIContext) *cobra.Command {
 	return nil
 }
+
+func (am AppModuleBasic) NewRESTRoutes(ctx context.CLIContext, rtr *mux.Router) {
+	rest.RegisterHandlers(ctx, rtr)
+}
diff --git a/x/distribution/client/rest/tx.go b/x/distribution/client/rest/tx.go
@@ -87,7 +87,7 @@ func newWithdrawDelegatorRewardsHandlerFn(cliCtx context.CLIContext, m codec.Mar
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msgs...)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msgs...)
 	}
 }
 
@@ -120,7 +120,7 @@ func newWithdrawDelegationRewardsHandlerFn(cliCtx context.CLIContext, m codec.Ma
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -148,7 +148,7 @@ func newSetDelegatorWithdrawalAddrHandlerFn(cliCtx context.CLIContext, m codec.M
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -177,7 +177,7 @@ func newWithdrawValidatorRewardsHandlerFn(cliCtx context.CLIContext, m codec.Mar
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msgs...)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msgs...)
 	}
 }
 
@@ -204,7 +204,7 @@ func newFundCommunityPoolHandlerFn(cliCtx context.CLIContext, m codec.Marshaler,
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 

diff --git a/x/gov/client/rest/tx.go b/x/gov/client/rest/tx.go
@@ -52,7 +52,7 @@ func newPostProposalHandlerFn(cliCtx context.CLIContext, txg context.TxGenerator
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -87,7 +87,7 @@ func newDepositHandlerFn(cliCtx context.CLIContext, txg context.TxGenerator) htt
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -127,7 +127,7 @@ func newVoteHandlerFn(cliCtx context.CLIContext, txg context.TxGenerator) http.H
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 

diff --git a/x/slashing/client/rest/tx.go b/x/slashing/client/rest/tx.go
@@ -61,7 +61,7 @@ func NewUnjailRequestHandlerFn(ctx context.CLIContext, m codec.Marshaler, txg co
 		if rest.CheckBadRequestError(w, msg.ValidateBasic()) {
 			return
 		}
-		tx.WriteGeneratedTxResponse(ctx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(ctx, w, req.BaseReq, msg)
 	}
 }
 

diff --git a/x/staking/client/rest/tx.go b/x/staking/client/rest/tx.go
@@ -86,7 +86,7 @@ func newPostDelegationsHandlerFn(cliCtx context.CLIContext, m codec.Marshaler, t
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -119,7 +119,7 @@ func newPostRedelegationsHandlerFn(cliCtx context.CLIContext, m codec.Marshaler,
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -151,7 +151,7 @@ func newPostUnbondingDelegationsHandlerFn(cliCtx context.CLIContext, m codec.Mar
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 

diff --git a/x/upgrade/client/rest/tx.go b/x/upgrade/client/rest/tx.go
@@ -101,7 +101,7 @@ func newPostPlanHandler(cliCtx context.CLIContext, txg context.TxGenerator, newM
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }
 
@@ -137,7 +137,7 @@ func newCancelPlanHandler(cliCtx context.CLIContext, txg context.TxGenerator, ne
 			return
 		}
 
-		tx.WriteGeneratedTxResponse(cliCtx, w, txg, req.BaseReq, msg)
+		tx.WriteGeneratedTxResponse(cliCtx, w, req.BaseReq, msg)
 	}
 }