finish remove optional flag

umee-network · Jan 5, 2023 · dd08df6 · dd08df6
1 parent 242a30b
commit dd08df6
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 236 deletions.
diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go
@@ -294,7 +294,7 @@ func (q Querier) MaxWithdraw(
 
 	if req.Denom != "" {
 		// Denom specified
-		denoms = []string{req.GetDenom()}
+		denoms = []string{req.Denom}
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {
@@ -355,7 +355,7 @@ func (q Querier) MaxBorrow(
 
 	if req.Denom != "" {
 		// Denom specified
-		denoms = []string{req.GetDenom()}
+		denoms = []string{req.Denom}
 	} else {
 		// Denom not specified
 		for _, t := range q.Keeper.GetAllRegisteredTokens(ctx) {

diff --git a/x/leverage/keeper/grpc_query_test.go b/x/leverage/keeper/grpc_query_test.go
@@ -212,7 +212,7 @@ func (s *IntegrationTestSuite) TestQuerier_MaxBorrow() {
 
 	resp, err := s.queryClient.MaxBorrow(ctx.Context(), &types.QueryMaxBorrow{
 		Address: addr.String(),
-		XDenom:  &types.QueryMaxBorrow_Denom{Denom: umeeDenom},
+		Denom:   umeeDenom,
 	})
 	require.NoError(err)
 
@@ -237,7 +237,7 @@ func (s *IntegrationTestSuite) TestQuerier_MaxBorrow() {
 
 	resp, err = s.queryClient.MaxBorrow(ctx.Context(), &types.QueryMaxBorrow{
 		Address: addr.String(),
-		XDenom:  &types.QueryMaxBorrow_Denom{Denom: umeeDenom},
+		Denom:   umeeDenom,
 	})
 	require.NoError(err)