Merge pull request #92 from b-harvest/fix-swagger

Update Swagger to 1.2.3
tendermint · Dec 16, 2020 · ba15d26 · ba15d26
2 parents 6202279 + fb94934
commit ba15d26
Show file tree

Hide file tree

Showing 41 changed files with 1,380 additions and 9,299 deletions.
diff --git a/app/app.go b/app/app.go
@@ -89,6 +89,9 @@ import (
 	liquidityparams "github.com/tendermint/liquidity/app/params"
 	liquiditykeeper "github.com/tendermint/liquidity/x/liquidity/keeper"
 	liquiditytypes "github.com/tendermint/liquidity/x/liquidity/types"
+
+	// unnamed import of statik for swagger UI support
+	_ "github.com/tendermint/liquidity/client/docs/statik"
 )
 
 const appName = "LiquidityApp"
@@ -596,7 +599,7 @@ func RegisterSwaggerAPI(ctx client.Context, rtr *mux.Router) {
 	}
 
 	staticServer := http.FileServer(statikFS)
-	rtr.PathPrefix("/swagger/").Handler(http.StripPrefix("/swagger/", staticServer))
+	rtr.PathPrefix("/swagger-liquidity/").Handler(http.StripPrefix("/swagger-liquidity/", staticServer))
 }
 
 // GetMaccPerms returns a copy of the module account permissions

diff --git a/app/test_helpers.go b/app/test_helpers.go
@@ -652,8 +652,8 @@ func TestDepositPool(t *testing.T, simapp *LiquidityApp, ctx sdk.Context, X, Y s
 			require.NotEqual(t, sdk.ZeroInt(), poolCoin)
 
 			require.True(t, msgs[i].Executed)
-			require.True(t, msgs[i].Succeed)
-			require.True(t, msgs[i].ToDelete)
+			require.True(t, msgs[i].Succeeded)
+			require.True(t, msgs[i].ToBeDeleted)
 
 			// error balance after endblock
 			depositorBalanceX := simapp.BankKeeper.GetBalance(ctx, addrs[i], pool.ReserveCoinDenoms[0])
@@ -718,8 +718,8 @@ func TestWithdrawPool(t *testing.T, simapp *LiquidityApp, ctx sdk.Context, poolC
 
 			withdrawMsgs := simapp.LiquidityKeeper.GetAllLiquidityPoolBatchWithdrawMsgs(ctx, batch)
 			require.True(t, withdrawMsgs[i].Executed)
-			require.True(t, withdrawMsgs[i].Succeed)
-			require.True(t, withdrawMsgs[i].ToDelete)
+			require.True(t, withdrawMsgs[i].Succeeded)
+			require.True(t, withdrawMsgs[i].ToBeDeleted)
 		}
 	}
 }

diff --git a/client/docs/config.json b/client/docs/config.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "Cosmos SDK Liquidity Module - REST and gRPC Gateway docs",
     "description": "A REST interface for state queries, transactions",
-    "version": "1.2.2"
+    "version": "1.2.3"
   },
   "apis": [
     {
@@ -21,12 +21,6 @@
           "Params": "LiquidityQueries"
         }
       }
-    },
-    {
-      "url": "./client/docs/swagger_legacy.yaml",
-      "dereference": {
-        "circular": "ignore"
-      }
     }
   ]
 }
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go