fix: use new root with config

Signed-off-by: gfanton <[email protected]>
gnolang · Nov 20, 2023 · f24d5ec · f24d5ec
1 parent 3bd97b5
commit f24d5ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/gno.land/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go
@@ -12,15 +12,11 @@ import (
 
 func main() {
 	baseCfg := client.BaseOptions{
-		Home:                  gnoenv.HomeDir(),
-		Remote:                "127.0.0.1:26657",
-		Quiet:                 false,
-		InsecurePasswordStdin: false,
-		Config:                "",
+		Home:   gnoenv.HomeDir(),
+		Remote: "127.0.0.1:26657",
 	}
 
 	cmd := client.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
-
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)
 

diff --git a/gnovm/cmd/gno/env.go b/gnovm/cmd/gno/env.go
@@ -41,15 +41,6 @@ type envVar struct {
 	Value string
 }
 
-func getEnvVar(vars []envVar, key string) string {
-	for _, env := range vars {
-		if env.Key == key {
-			return env.Value
-		}
-	}
-	return ""
-}
-
 func findEnv(env []envVar, name string) string {
 	for _, e := range env {
 		if e.Key == name {

diff --git a/tm2/pkg/crypto/keys/client/root.go b/tm2/pkg/crypto/keys/client/root.go
@@ -19,7 +19,13 @@ type baseCfg struct {
 }
 
 func NewRootCmd(io commands.IO) *commands.Command {
-	cfg := &baseCfg{}
+	return NewRootCmdWithBaseConfig(io, DefaultBaseOptions)
+}
+
+func NewRootCmdWithBaseConfig(io commands.IO, base BaseOptions) *commands.Command {
+	cfg := &baseCfg{
+		BaseOptions: base,
+	}
 
 	cmd := commands.NewCommand(
 		commands.Metadata{