fix: Local-interchain cleanup (#710)

* Fix compiler error * Use go run in Makefile Prevents needing to build the binary first. * Remove unecessary init functions * Remove unecessary global var * Fix misspelling in var name * Revert "Remove unecessary global var" This reverts commit 20cf604. * Add comment for why InstallDir must be public --------- Co-authored-by: Reece Williams <[email protected]> (cherry picked from commit 5c4c2b6)
strangelove-ventures · Sep 27, 2023 · 6dc2117 · 6dc2117
1 parent 4b00048
commit 6dc2117
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git a/local-interchain/Makefile b/local-interchain/Makefile
@@ -12,7 +12,7 @@ build:
 
 .PHONY: run
 run:
-	../bin/local-ic $(filter-out $@,$(MAKECMDGOALS))
+	go run ./cmd/local-ic $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: install
 install:

diff --git a/local-interchain/cmd/local-ic/chains.go b/local-interchain/cmd/local-ic/chains.go
@@ -59,7 +59,3 @@ func GetFiles() []string {
 
 	return fileNames
 }
-
-func init() {
-	rootCmd.AddCommand(chainsCmd)
-}
diff --git a/local-interchain/cmd/local-ic/main.go b/local-interchain/cmd/local-ic/main.go
@@ -6,6 +6,10 @@ import (
 )
 
 func main() {
+	rootCmd.AddCommand(chainsCmd)
+	rootCmd.AddCommand(newChainCmd)
+	rootCmd.AddCommand(startCmd)
+
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "error while executing your CLI. Err: %v\n", err)
 		os.Exit(1)

diff --git a/local-interchain/cmd/local-ic/new_chain.go b/local-interchain/cmd/local-ic/new_chain.go
@@ -180,7 +180,3 @@ func getOrDefault[T any](output string, defaultVal T) T {
 
 	return any(text).(T)
 }
-
-func init() {
-	rootCmd.AddCommand(newChainCmd)
-}
diff --git a/local-interchain/cmd/local-ic/root.go b/local-interchain/cmd/local-ic/root.go
@@ -10,6 +10,7 @@ import (
 )
 
 var (
+	// This must be global for the Makefile to build properly (ldflags).
 	MakeFileInstallDirectory string
 )
 

diff --git a/local-interchain/cmd/local-ic/start_chain.go b/local-interchain/cmd/local-ic/start_chain.go
@@ -30,7 +30,3 @@ var startCmd = &cobra.Command{
 		interchain.StartChain(parentDir, configPath)
 	},
 }
-
-func init() {
-	rootCmd.AddCommand(startCmd)
-}