fix: gen swagger scripts with ns

White-Whale-Defi-Platform · Jan 26, 2024 · e8040c0 · e8040c0
1 parent 2087445
commit e8040c0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -257,7 +257,7 @@ proto-format:
 		find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi
 
 update-swagger-docs:
-	$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m
+	$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m -ns migaloo
 	@if [ -n "$(git status --porcelain)" ]; then \
 		echo "\033[91mSwagger docs are out of sync!!!\033[0m";\
 		exit 1;\

diff --git a/app/app.go b/app/app.go
@@ -154,11 +154,12 @@ import (
 	appparams "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/params"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/client/docs/statik"
 	"github.com/rakyll/statik/fs"
 
 	v3_0_2 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v3_0_2"
 	v4 "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app/upgrades/v4_1_0"
+
+	_ "github.com/White-Whale-Defi-Platform/migaloo-chain/v4/client/docs/statik"
 )
 
 const (
@@ -1108,26 +1109,21 @@ func (app *MigalooApp) AppCodec() codec.Codec {
 
 // RegisterSwaggerAPI registers swagger route with API Server
 func RegisterSwaggerAPI(rtr *mux.Router) {
-	statikFS, err := fs.New()
+	cosmosStatikFs, err := fs.New()
 	if err != nil {
 		panic(err)
 	}
 
-	// List the files in the statikFS
-	fmt.Println("statikFS files: ")
-	err = fs.Walk(statikFS, "/", func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		fmt.Println("statik path: ", path) // This will log the path of each file in the statikFS
-		return nil
-	})
+	cosmosStaticServer := http.FileServer(cosmosStatikFs)
+
+	statikFS, err := fs.NewWithNamespace("migaloo")
 	if err != nil {
-		fmt.Println(err)
+		panic(err)
 	}
 
 	staticServer := http.FileServer(statikFS)
 
+	rtr.PathPrefix("/swagger/cosmos-sdk").Handler(http.StripPrefix("/swagger/cosmos-sdk", cosmosStaticServer))
 	rtr.PathPrefix("/swagger/").Handler(http.StripPrefix("/swagger/", staticServer))
 }
 

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/index.html b/client/docs/swagger-ui/index.html
@@ -30,7 +30,6 @@
   </head>
 
   <body>
-    <h1>This is a test script</h1>
     <div id="swagger-ui"></div>
 
     <script src="swagger-ui-bundle.js"> </script>

diff --git a/client/docs/swagger-ui/ramdom.html b/client/docs/swagger-ui/ramdom.html
diff --git a/cmd/migalood/main.go b/cmd/migalood/main.go
@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app"
 	"github.com/White-Whale-Defi-Platform/migaloo-chain/v4/cmd/migalood/cmd"
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
+
+	"github.com/White-Whale-Defi-Platform/migaloo-chain/v4/app"
 )
 
 func main() {

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -0,0 +1 @@
+./bin/migalood start  --home mytestnet
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ @@
       </head>
       <body>
-        <h1>This is a test script</h1>
         <div id="swagger-ui"></div>
         <script src="swagger-ui-bundle.js"> </script>
@@ Expand Down @@