feat!: remove legacy REST

client/grpc/tmservice/service_test.go

@@ -12,7 +12,7 @@ import (
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
 	qtypes "github.com/cosmos/cosmos-sdk/types/query"
-	"github.com/cosmos/cosmos-sdk/types/rest"
+	"github.com/cosmos/cosmos-sdk/testutil/rest"
 	"github.com/cosmos/cosmos-sdk/version"
 )
 

client/rpc/block.go

@@ -3,16 +3,13 @@ package rpc
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strconv"
 
-	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
-	"github.com/cosmos/cosmos-sdk/types/rest"
 )
 
 // BlockCommand returns the verified block data for a given heights
@@ -88,47 +85,3 @@ func GetChainHeight(clientCtx client.Context) (int64, error) {
 	height := status.SyncInfo.LatestBlockHeight
 	return height, nil
 }
-
-// REST handler to get a block
-func BlockRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		vars := mux.Vars(r)
-
-		height, err := strconv.ParseInt(vars["height"], 10, 64)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest,
-				"couldn't parse block height. Assumed format is '/block/{height}'.")
-			return
-		}
-
-		chainHeight, err := GetChainHeight(clientCtx)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusInternalServerError, "failed to parse chain height")
-			return
-		}
-
-		if height > chainHeight {
-			rest.WriteErrorResponse(w, http.StatusNotFound, "requested block height is bigger then the chain length")
-			return
-		}
-
-		output, err := getBlock(clientCtx, &height)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-
-		rest.PostProcessResponseBare(w, clientCtx, output)
-	}
-}
-
-// REST handler to get the latest block
-func LatestBlockRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		output, err := getBlock(clientCtx, nil)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-
-		rest.PostProcessResponseBare(w, clientCtx, output)
-	}
-}

client/rpc/rpc_test.go

@@ -5,13 +5,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 
 	"github.com/cosmos/cosmos-sdk/client/rpc"
-	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
-	"github.com/cosmos/cosmos-sdk/types/rest"
 )
 
 type IntegrationTestSuite struct {
@@ -46,17 +43,6 @@ func (s *IntegrationTestSuite) TestStatusCommand() {
 	s.Require().Contains(out.String(), fmt.Sprintf("\"moniker\":\"%s\"", val0.Moniker))
 }
 
-func (s *IntegrationTestSuite) TestLatestBlocks() {
-	val0 := s.network.Validators[0]
-
-	res, err := rest.GetRequest(fmt.Sprintf("%s/blocks/latest", val0.APIAddress))
-	s.Require().NoError(err)
-
-	var result ctypes.ResultBlock
-	err = legacy.Cdc.UnmarshalJSON(res, &result)
-	s.Require().NoError(err)
-}
-
 func TestIntegrationTestSuite(t *testing.T) {
 	suite.Run(t, new(IntegrationTestSuite))
 }

client/rpc/status.go

@@ -2,7 +2,6 @@ package rpc
 
 import (
 	"context"
-	"net/http"
 
 	"github.com/spf13/cobra"
 
@@ -14,8 +13,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	"github.com/cosmos/cosmos-sdk/types/rest"
-	"github.com/cosmos/cosmos-sdk/version"
 )
 
 // ValidatorInfo is info about the node's validator, same as Tendermint,
@@ -88,45 +85,3 @@ func getNodeStatus(clientCtx client.Context) (*ctypes.ResultStatus, error) {
 
 	return node.Status(context.Background())
 }
-
-// NodeInfoResponse defines a response type that contains node status and version
-// information.
-type NodeInfoResponse struct {
-	p2p.DefaultNodeInfo `json:"node_info"`
-
-	ApplicationVersion version.Info `json:"application_version"`
-}
-
-// REST handler for node info
-func NodeInfoRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		status, err := getNodeStatus(clientCtx)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-
-		resp := NodeInfoResponse{
-			DefaultNodeInfo:    status.NodeInfo,
-			ApplicationVersion: version.NewInfo(),
-		}
-
-		rest.PostProcessResponseBare(w, clientCtx, resp)
-	}
-}
-
-// SyncingResponse defines a response type that contains node syncing information.
-type SyncingResponse struct {
-	Syncing bool `json:"syncing"`
-}
-
-// REST handler for node syncing
-func NodeSyncingRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		status, err := getNodeStatus(clientCtx)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-
-		rest.PostProcessResponseBare(w, clientCtx, SyncingResponse{Syncing: status.SyncInfo.CatchingUp})
-	}
-}

client/rpc/validators.go

@@ -3,11 +3,9 @@ package rpc
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strconv"
 	"strings"
 
-	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
 	tmtypes "github.com/tendermint/tendermint/types"
 
@@ -16,7 +14,7 @@ import (
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/rest"
+	"github.com/cosmos/cosmos-sdk/types/query"
 )
 
 // TODO these next two functions feel kinda hacky based on their placement
@@ -60,7 +58,7 @@ func ValidatorCommand() *cobra.Command {
 
 	cmd.Flags().StringP(flags.FlagNode, "n", "tcp://localhost:26657", "Node to connect to")
 	cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|kwallet|pass|test)")
-	cmd.Flags().Int(flags.FlagPage, rest.DefaultPage, "Query a specific page of paginated results")
+	cmd.Flags().Int(flags.FlagPage, query.DefaultPage, "Query a specific page of paginated results")
 	cmd.Flags().Int(flags.FlagLimit, 100, "Query number of results returned per page")
 
 	return cmd
@@ -148,57 +146,3 @@ func GetValidators(ctx context.Context, clientCtx client.Context, height *int64,
 
 	return out, nil
 }
-
-// REST
-
-// Validator Set at a height REST handler
-func ValidatorSetRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 100)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse pagination parameters")
-			return
-		}
-
-		vars := mux.Vars(r)
-		height, err := strconv.ParseInt(vars["height"], 10, 64)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse block height")
-			return
-		}
-
-		chainHeight, err := GetChainHeight(clientCtx)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusInternalServerError, "failed to parse chain height")
-			return
-		}
-		if height > chainHeight {
-			rest.WriteErrorResponse(w, http.StatusNotFound, "requested block height is bigger then the chain length")
-			return
-		}
-
-		output, err := GetValidators(r.Context(), clientCtx, &height, &page, &limit)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-		rest.PostProcessResponse(w, clientCtx, output)
-	}
-}
-
-// Latest Validator Set REST handler
-func LatestValidatorSetRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		_, page, limit, err := rest.ParseHTTPArgsWithLimit(r, 100)
-		if err != nil {
-			rest.WriteErrorResponse(w, http.StatusBadRequest, "failed to parse pagination parameters")
-			return
-		}
-
-		output, err := GetValidators(r.Context(), clientCtx, nil, &page, &limit)
-		if rest.CheckInternalServerError(w, err) {
-			return
-		}
-
-		rest.PostProcessResponse(w, clientCtx, output)
-	}
-}