Cleanup

server/api/server.go

@@ -59,18 +59,13 @@ func (s *Server) Start(cfg config.Config) error {
 		s.registerMetrics()
 	}
 
-	addr := cfg.API.Address
-	if !strings.Contains(addr, "tcp://") {
-		addr = "tcp://" + addr
-	}
-
 	tmCfg := tmrpcserver.DefaultConfig()
 	tmCfg.MaxOpenConnections = int(cfg.API.MaxOpenConnections)
 	tmCfg.ReadTimeout = time.Duration(cfg.API.RPCReadTimeout) * time.Second
 	tmCfg.WriteTimeout = time.Duration(cfg.API.RPCWriteTimeout) * time.Second
 	tmCfg.MaxBodyBytes = int64(cfg.API.RPCMaxBodyBytes)
 
-	listener, err := tmrpcserver.Listen(addr, tmCfg)
+	listener, err := tmrpcserver.Listen(cfg.API.Address, tmCfg)
 	if err != nil {
 		return err
 	}

testutil/network.go

@@ -98,6 +98,7 @@ type (
 		NodeID     string
 		PubKey     crypto.PubKey
 		Moniker    string
+		APIAddress string
 		RPCAddress string
 		P2PAddress string
 		Address    sdk.AccAddress
@@ -144,10 +145,10 @@ func NewTestNetwork(t *testing.T, cfg Config) *Network {
 
 		apiAddr, _, err := server.FreeTCPAddr()
 		require.NoError(t, err)
+		appCfg.API.Address = apiAddr
 
 		apiURL, err := url.Parse(apiAddr)
 		require.NoError(t, err)
-		appCfg.API.Address = fmt.Sprintf("%s:%s", apiURL.Hostname(), apiURL.Port())
 
 		ctx := server.NewDefaultContext()
 		tmCfg := ctx.Config
@@ -251,6 +252,7 @@ func NewTestNetwork(t *testing.T, cfg Config) *Network {
 			Moniker:    nodeDirName,
 			RPCAddress: rpcAddr,
 			P2PAddress: p2pAddr,
+			APIAddress: fmt.Sprintf("http://%s:%s", apiURL.Hostname(), apiURL.Port()),
 			Address:    addr,
 			ValAddress: sdk.ValAddress(addr),
 		}

types/rest/rest.go

@@ -436,3 +436,23 @@ func ParseQueryParamBool(r *http.Request, param string) bool {
 
 	return false
 }
+
+// GetRequest defines a wrapper around an HTTP GET request with a provided URL.
+// An error is returned if the request or reading the body fails.
+func GetRequest(url string) ([]byte, error) {
+	res, err := http.Get(url) // nolint:gosec
+	if err != nil {
+		return nil, err
+	}
+
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = res.Body.Close(); err != nil {
+		return nil, err
+	}
+
+	return body, nil
+}

x/bank/client/rest/query_test.go

@@ -2,8 +2,6 @@ package rest_test
 
 import (
 	"fmt"
-	"io/ioutil"
-	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -39,54 +37,97 @@ func (s *IntegrationTestSuite) TearDownSuite() {
 
 func (s *IntegrationTestSuite) TestQueryBalancesRequestHandlerFn() {
 	val := s.network.Validators[0]
-	apiAddr := val.AppConfig.API.Address
-
-	url := fmt.Sprintf("http://%s/bank/balances/%s?height=1", apiAddr, val.Address)
-	resp, err := getRequest(url)
-	s.Require().NoError(err)
-
-	bz, err := rest.ParseResponseWithHeight(val.ClientCtx.JSONMarshaler, resp)
-	s.Require().NoError(err)
-
-	var balances sdk.Coins
-	s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(bz, &balances))
-
-	expected := sdk.NewCoins(
-		sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), s.cfg.AccountTokens),
-		sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Sub(s.cfg.BondedTokens)),
-	)
-	s.Require().Equal(expected.String(), balances.String())
-
-	url = fmt.Sprintf("http://%s/bank/balances/%s?height=1&denom=%s", apiAddr, val.Address, s.cfg.BondDenom)
-	resp, err = getRequest(url)
-	s.Require().NoError(err)
-
-	bz, err = rest.ParseResponseWithHeight(val.ClientCtx.JSONMarshaler, resp)
-	s.Require().NoError(err)
-
-	var balance sdk.Coin
-	s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(bz, &balance))
-	s.Require().Equal(expected[1].String(), balance.String())
-}
-
-func TestIntegrationTestSuite(t *testing.T) {
-	suite.Run(t, new(IntegrationTestSuite))
-}
+	baseURL := val.APIAddress
+
+	testCases := []struct {
+		name     string
+		url      string
+		respType fmt.Stringer
+		expected fmt.Stringer
+	}{
+		{
+			"total account balance",
+			fmt.Sprintf("%s/bank/balances/%s?height=1", baseURL, val.Address),
+			&sdk.Coins{},
+			sdk.NewCoins(
+				sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), s.cfg.AccountTokens),
+				sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Sub(s.cfg.BondedTokens)),
+			),
+		},
+		{
+			"total account balance of a specific denom",
+			fmt.Sprintf("%s/bank/balances/%s?height=1&denom=%s", baseURL, val.Address, s.cfg.BondDenom),
+			&sdk.Coin{},
+			sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Sub(s.cfg.BondedTokens)),
+		},
+		{
+			"total account balance of a bogus denom",
+			fmt.Sprintf("%s/bank/balances/%s?height=1&denom=foobar", baseURL, val.Address),
+			&sdk.Coin{},
+			sdk.NewCoin("foobar", sdk.ZeroInt()),
+		},
+	}
 
-func getRequest(url string) ([]byte, error) {
-	res, err := http.Get(url) // nolint:gosec
-	if err != nil {
-		return nil, err
+	for _, tc := range testCases {
+		tc := tc
+		s.Run(tc.name, func() {
+			resp, err := rest.GetRequest(tc.url)
+			s.Require().NoError(err)
+
+			bz, err := rest.ParseResponseWithHeight(val.ClientCtx.JSONMarshaler, resp)
+			s.Require().NoError(err)
+			s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(bz, tc.respType))
+			s.Require().Equal(tc.expected.String(), tc.respType.String())
+		})
 	}
+}
 
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, err
+func (s *IntegrationTestSuite) TestTotalSupplyHandlerFn() {
+	val := s.network.Validators[0]
+	baseURL := val.APIAddress
+
+	testCases := []struct {
+		name     string
+		url      string
+		respType fmt.Stringer
+		expected fmt.Stringer
+	}{
+		{
+			"total supply",
+			fmt.Sprintf("%s/bank/total?height=1", baseURL),
+			&sdk.Coins{}, sdk.NewCoins(
+				sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), s.cfg.AccountTokens),
+				sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Add(sdk.NewInt(10))),
+			),
+		},
+		{
+			"total supply of a specific denom",
+			fmt.Sprintf("%s/bank/total/%s?height=1", baseURL, s.cfg.BondDenom),
+			&sdk.Coin{},
+			sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Add(sdk.NewInt(10))),
+		},
+		{
+			"total supply of a bogus denom",
+			fmt.Sprintf("%s/bank/total/foobar?height=1", baseURL),
+			&sdk.Coin{},
+			sdk.NewCoin("foobar", sdk.ZeroInt()),
+		},
 	}
 
-	if err = res.Body.Close(); err != nil {
-		return nil, err
+	for _, tc := range testCases {
+		tc := tc
+		s.Run(tc.name, func() {
+			resp, err := rest.GetRequest(tc.url)
+			s.Require().NoError(err)
+
+			bz, err := rest.ParseResponseWithHeight(val.ClientCtx.JSONMarshaler, resp)
+			s.Require().NoError(err)
+			s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(bz, tc.respType))
+			s.Require().Equal(tc.expected.String(), tc.respType.String())
+		})
 	}
+}
 
-	return body, nil
+func TestIntegrationTestSuite(t *testing.T) {
+	suite.Run(t, new(IntegrationTestSuite))
 }

x/bank/keeper/querier.go

@@ -99,12 +99,13 @@ func querySupplyOf(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, er
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
 	}
 
-	supply := k.GetSupply(ctx).GetTotal().AmountOf(params.Denom)
+	amount := k.GetSupply(ctx).GetTotal().AmountOf(params.Denom)
+	supply := sdk.NewCoin(params.Denom, amount)
 
-	res, err := supply.MarshalJSON()
+	bz, err := codec.MarshalJSONIndent(types.ModuleCdc, supply)
 	if err != nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
 	}
 
-	return res, nil
+	return bz, nil
 }

x/bank/keeper/querier_test.go

@@ -133,9 +133,9 @@ func (suite *IntegrationTestSuite) TestQuerier_QueryTotalSupplyOf() {
 	suite.Require().NoError(err)
 	suite.Require().NotNil(res)
 
-	var resp sdk.Int
+	var resp sdk.Coin
 	suite.Require().NoError(app.Codec().UnmarshalJSON(res, &resp))
-	suite.Require().Equal(test1Supply.Amount, resp)
+	suite.Require().Equal(test1Supply, resp)
 }
 
 func (suite *IntegrationTestSuite) TestQuerierRouteNotFound() {