Merge branch 'main' into feat/remove-relayer

ignite · May 3, 2024 · 2828366 · 2828366
2 parents 307a0e5 + 8d9eccd
commit 2828366
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 18 deletions.
diff --git a/changelog.md b/changelog.md
@@ -63,6 +63,7 @@
 - [#3995](https://github.com/ignite/cli/pull/3995) Fix interface check for ibc modules
 - [#3953](https://github.com/ignite/cli/pull/3953) Fix apps `Stdout` is redirected to `Stderr`
 - [#3863](https://github.com/ignite/cli/pull/3963) Fix breaking issue for app client API when reading app chain info
+- [#4112](https://github.com/ignite/cli/pull/4112) Remove duplicate SetCmdClientContextHandler
 
 ## [`v28.2.0`](https://github.com/ignite/cli/releases/tag/v28.2.0)
 

diff --git a/ignite/pkg/cosmosgen/template.go b/ignite/pkg/cosmosgen/template.go
@@ -18,8 +18,6 @@ var (
 
 	templateTSClientRoot           = newTemplateWriter("root")
 	templateTSClientModule         = newTemplateWriter("module")
-	templateTSClientVue            = newTemplateWriter("vue")
-	templateTSClientVueRoot        = newTemplateWriter("vue-root")
 	templateTSClientComposable     = newTemplateWriter("composable")
 	templateTSClientComposableRoot = newTemplateWriter("composable-root")
 )

diff --git a/ignite/services/chain/generate.go b/ignite/services/chain/generate.go
@@ -308,14 +308,6 @@ func (c *Chain) Generate(
 	return nil
 }
 
-func (c Chain) joinGeneratedPath(rootPath string) string {
-	if filepath.IsAbs(rootPath) {
-		return filepath.Join(rootPath, "generated")
-	}
-
-	return filepath.Join(c.app.Path, rootPath, "generated")
-}
-
 func (c Chain) saveClientConfig(client base.Client) error {
 	path := c.ConfigPath()
 	file, err := os.Open(path)

diff --git a/ignite/templates/app/files-consumer/cmd/{{binaryNamePrefix}}d/cmd/root.go.plush b/ignite/templates/app/files-consumer/cmd/{{binaryNamePrefix}}d/cmd/root.go.plush
@@ -95,10 +95,6 @@ func NewRootCmd() *cobra.Command {
 				return err
 			}
 
-			if err := client.SetCmdClientContextHandler(clientCtx, cmd); err != nil {
-				return err
-			}
-
 			customAppTemplate, customAppConfig := initAppConfig()
 			customCMTConfig := initCometBFTConfig()
 

diff --git a/ignite/templates/app/files/cmd/{{binaryNamePrefix}}d/cmd/root.go.plush b/ignite/templates/app/files/cmd/{{binaryNamePrefix}}d/cmd/root.go.plush
@@ -93,10 +93,6 @@ func NewRootCmd() *cobra.Command {
 				return err
 			}
 
-			if err := client.SetCmdClientContextHandler(clientCtx, cmd); err != nil {
-				return err
-			}
-
 			customAppTemplate, customAppConfig := initAppConfig()
 			customCMTConfig := initCometBFTConfig()