From 5b4fb85f7ecd0f382eeff58daabbacd99900bcec Mon Sep 17 00:00:00 2001 From: Christopher Goes Date: Wed, 25 Apr 2018 22:32:22 +0200 Subject: [PATCH] Fn suffix & http.HandlerFunc --- client/rpc/block.go | 4 ++-- client/rpc/root.go | 12 ++++++------ client/rpc/status.go | 4 ++-- client/rpc/validators.go | 4 ++-- client/tx/broadcast.go | 2 +- client/tx/query.go | 8 ++++---- client/tx/root.go | 2 +- client/tx/search.go | 2 +- x/auth/client/rest/query.go | 4 ++-- x/bank/client/rest/sendtx.go | 6 +++--- x/ibc/client/rest/transfer.go | 4 ++-- x/stake/client/rest/query.go | 6 +++--- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/client/rpc/block.go b/client/rpc/block.go index 46f6cdbd80..12c65fa700 100644 --- a/client/rpc/block.go +++ b/client/rpc/block.go @@ -95,7 +95,7 @@ func printBlock(cmd *cobra.Command, args []string) error { // REST // REST handler to get a block -func BlockRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func BlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) height, err := strconv.ParseInt(vars["height"], 10, 64) @@ -121,7 +121,7 @@ func BlockRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *htt } // REST handler to get the latest block -func LatestBlockRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func LatestBlockRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { height, err := GetChainHeight(ctx) if err != nil { diff --git a/client/rpc/root.go b/client/rpc/root.go index 81be7ddf43..f779bd7292 100644 --- a/client/rpc/root.go +++ b/client/rpc/root.go @@ -47,10 +47,10 @@ func initClientCommand() *cobra.Command { // Register REST endpoints func RegisterRoutes(ctx context.CoreContext, r *mux.Router) { - r.HandleFunc("/node_info", NodeInfoRequestHandler(ctx)).Methods("GET") - r.HandleFunc("/syncing", NodeSyncingRequestHandler(ctx)).Methods("GET") - r.HandleFunc("/blocks/latest", LatestBlockRequestHandler(ctx)).Methods("GET") - r.HandleFunc("/blocks/{height}", BlockRequestHandler(ctx)).Methods("GET") - r.HandleFunc("/validatorsets/latest", LatestValidatorSetRequestHandler(ctx)).Methods("GET") - r.HandleFunc("/validatorsets/{height}", ValidatorSetRequestHandler(ctx)).Methods("GET") + r.HandleFunc("/node_info", NodeInfoRequestHandlerFn(ctx)).Methods("GET") + r.HandleFunc("/syncing", NodeSyncingRequestHandlerFn(ctx)).Methods("GET") + r.HandleFunc("/blocks/latest", LatestBlockRequestHandlerFn(ctx)).Methods("GET") + r.HandleFunc("/blocks/{height}", BlockRequestHandlerFn(ctx)).Methods("GET") + r.HandleFunc("/validatorsets/latest", LatestValidatorSetRequestHandlerFn(ctx)).Methods("GET") + r.HandleFunc("/validatorsets/{height}", ValidatorSetRequestHandlerFn(ctx)).Methods("GET") } diff --git a/client/rpc/status.go b/client/rpc/status.go index 919fea4ce1..70d6628e43 100644 --- a/client/rpc/status.go +++ b/client/rpc/status.go @@ -52,7 +52,7 @@ func printNodeStatus(cmd *cobra.Command, args []string) error { // REST // REST handler for node info -func NodeInfoRequestHandler(ctx context.CoreContext) func(w http.ResponseWriter, r *http.Request) { +func NodeInfoRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { status, err := getNodeStatus(ctx) if err != nil { @@ -73,7 +73,7 @@ func NodeInfoRequestHandler(ctx context.CoreContext) func(w http.ResponseWriter, } // REST handler for node syncing -func NodeSyncingRequestHandler(ctx context.CoreContext) func(w http.ResponseWriter, r *http.Request) { +func NodeSyncingRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { status, err := getNodeStatus(ctx) if err != nil { diff --git a/client/rpc/validators.go b/client/rpc/validators.go index 768cad7bcf..f9b1f6f8f8 100644 --- a/client/rpc/validators.go +++ b/client/rpc/validators.go @@ -73,7 +73,7 @@ func printValidators(cmd *cobra.Command, args []string) error { // REST // Validator Set at a height REST handler -func ValidatorSetRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func ValidatorSetRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) height, err := strconv.ParseInt(vars["height"], 10, 64) @@ -99,7 +99,7 @@ func ValidatorSetRequestHandler(ctx context.CoreContext) func(http.ResponseWrite } // Latest Validator Set REST handler -func LatestValidatorSetRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func LatestValidatorSetRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { height, err := GetChainHeight(ctx) if err != nil { diff --git a/client/tx/broadcast.go b/client/tx/broadcast.go index d325ff15b5..7f55e97d79 100644 --- a/client/tx/broadcast.go +++ b/client/tx/broadcast.go @@ -13,7 +13,7 @@ type BroadcastTxBody struct { } // BroadcastTx REST Handler -func BroadcastTxRequestHandler(ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func BroadcastTxRequestHandlerFn(ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var m BroadcastTxBody diff --git a/client/tx/query.go b/client/tx/query.go index 2c53622e13..0583f94f5b 100644 --- a/client/tx/query.go +++ b/client/tx/query.go @@ -34,7 +34,7 @@ func QueryTxCmd(cdc *wire.Codec) *cobra.Command { hashHexStr := args[0] trustNode := viper.GetBool(client.FlagTrustNode) - output, err := queryTx(context.NewCoreContextFromViper(), cdc, hashHexStr, trustNode) + output, err := queryTx(cdc, context.NewCoreContextFromViper(), hashHexStr, trustNode) if err != nil { return err } @@ -51,7 +51,7 @@ func QueryTxCmd(cdc *wire.Codec) *cobra.Command { return cmd } -func queryTx(ctx context.CoreContext, cdc *wire.Codec, hashHexStr string, trustNode bool) ([]byte, error) { +func queryTx(cdc *wire.Codec, ctx context.CoreContext, hashHexStr string, trustNode bool) ([]byte, error) { hash, err := hex.DecodeString(hashHexStr) if err != nil { return nil, err @@ -109,7 +109,7 @@ func parseTx(cdc *wire.Codec, txBytes []byte) (sdk.Tx, error) { // REST // transaction query REST handler -func QueryTxRequestHandler(cdc *wire.Codec, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func QueryTxRequestHandlerFn(cdc *wire.Codec, ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) hashHexStr := vars["hash"] @@ -119,7 +119,7 @@ func QueryTxRequestHandler(cdc *wire.Codec, ctx context.CoreContext) func(http.R trustNode = true } - output, err := queryTx(ctx, cdc, hashHexStr, trustNode) + output, err := queryTx(cdc, ctx, hashHexStr, trustNode) if err != nil { w.WriteHeader(500) w.Write([]byte(err.Error())) diff --git a/client/tx/root.go b/client/tx/root.go index caae53620b..e8abf33185 100644 --- a/client/tx/root.go +++ b/client/tx/root.go @@ -18,7 +18,7 @@ func AddCommands(cmd *cobra.Command, cdc *wire.Codec) { // register REST routes func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec) { - r.HandleFunc("/txs/{hash}", QueryTxRequestHandler(cdc, ctx)).Methods("GET") + r.HandleFunc("/txs/{hash}", QueryTxRequestHandlerFn(cdc, ctx)).Methods("GET") // r.HandleFunc("/txs", SearchTxRequestHandler(cdc)).Methods("GET") // r.HandleFunc("/txs/sign", SignTxRequstHandler).Methods("POST") // r.HandleFunc("/txs/broadcast", BroadcastTxRequestHandler).Methods("POST") diff --git a/client/tx/search.go b/client/tx/search.go index 29b330a308..3e3b1daa60 100644 --- a/client/tx/search.go +++ b/client/tx/search.go @@ -94,7 +94,7 @@ func formatTxResults(cdc *wire.Codec, res []*ctypes.ResultTx) ([]txInfo, error) // REST // Search Tx REST Handler -func SearchTxRequestHandler(ctx context.CoreContext, cdc *wire.Codec) func(http.ResponseWriter, *http.Request) { +func SearchTxRequestHandlerFn(ctx context.CoreContext, cdc *wire.Codec) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tag := r.FormValue("tag") if tag == "" { diff --git a/x/auth/client/rest/query.go b/x/auth/client/rest/query.go index fd51789c1c..52244fec9c 100644 --- a/x/auth/client/rest/query.go +++ b/x/auth/client/rest/query.go @@ -17,12 +17,12 @@ import ( func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, storeName string) { r.HandleFunc( "/accounts/{address}", - QueryAccountRequestHandler(storeName, cdc, auth.GetAccountDecoder(cdc), ctx), + QueryAccountRequestHandlerFn(storeName, cdc, auth.GetAccountDecoder(cdc), ctx), ).Methods("GET") } // query accountREST Handler -func QueryAccountRequestHandler(storeName string, cdc *wire.Codec, decoder sdk.AccountDecoder, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func QueryAccountRequestHandlerFn(storeName string, cdc *wire.Codec, decoder sdk.AccountDecoder, ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) addr := vars["address"] diff --git a/x/bank/client/rest/sendtx.go b/x/bank/client/rest/sendtx.go index 15256ce093..6ce472b6fd 100644 --- a/x/bank/client/rest/sendtx.go +++ b/x/bank/client/rest/sendtx.go @@ -17,7 +17,7 @@ import ( // RegisterRoutes - Central function to define routes that get registered by the main application func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - r.HandleFunc("/accounts/{address}/send", SendRequestHandler(cdc, kb, ctx)).Methods("POST") + r.HandleFunc("/accounts/{address}/send", SendRequestHandlerFn(cdc, kb, ctx)).Methods("POST") } type sendBody struct { @@ -30,8 +30,8 @@ type sendBody struct { Sequence int64 `json:"sequence"` } -// SendRequestHandler - http request handler to send coins to a address -func SendRequestHandler(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +// SendRequestHandlerFn - http request handler to send coins to a address +func SendRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { // collect data vars := mux.Vars(r) diff --git a/x/ibc/client/rest/transfer.go b/x/ibc/client/rest/transfer.go index 033ef6be53..48a29ee801 100644 --- a/x/ibc/client/rest/transfer.go +++ b/x/ibc/client/rest/transfer.go @@ -16,7 +16,7 @@ import ( // RegisterRoutes - Central function to define routes that get registered by the main application func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - r.HandleFunc("/ibc/{destchain}/{address}/send", TransferRequestHandler(cdc, kb, ctx)).Methods("POST") + r.HandleFunc("/ibc/{destchain}/{address}/send", TransferRequestHandlerFn(cdc, kb, ctx)).Methods("POST") } type transferBody struct { @@ -30,7 +30,7 @@ type transferBody struct { // TransferRequestHandler - http request handler to transfer coins to a address // on a different chain via IBC -func TransferRequestHandler(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +func TransferRequestHandlerFn(cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { // collect data vars := mux.Vars(r) diff --git a/x/stake/client/rest/query.go b/x/stake/client/rest/query.go index 96bdcc95de..8eb0e03ceb 100644 --- a/x/stake/client/rest/query.go +++ b/x/stake/client/rest/query.go @@ -16,11 +16,11 @@ import ( // RegisterRoutes - Central function to define routes that get registered by the main application func RegisterRoutes(ctx context.CoreContext, r *mux.Router, cdc *wire.Codec, kb keys.Keybase) { - r.HandleFunc("/stake/{delegator}/bonding_status/{candidate}", BondingStatusHandler("stake", cdc, kb, ctx)).Methods("GET") + r.HandleFunc("/stake/{delegator}/bonding_status/{candidate}", BondingStatusHandlerFn("stake", cdc, kb, ctx)).Methods("GET") } -// BondingStatusHandler - http request handler to query delegator bonding status -func BondingStatusHandler(storeName string, cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) func(http.ResponseWriter, *http.Request) { +// BondingStatusHandlerFn - http request handler to query delegator bonding status +func BondingStatusHandlerFn(storeName string, cdc *wire.Codec, kb keys.Keybase, ctx context.CoreContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { // read parameters vars := mux.Vars(r)