fix: use keyscli module to be able to share package code with test in…

…tegration Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
gnolang · Dec 22, 2023 · 3b7ab05 · 3b7ab05
1 parent f7aa61f
commit 3b7ab05
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/gno.land/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go
@@ -5,6 +5,7 @@ import (
  "fmt"
  "os"
 
+ "github.com/gnolang/gno/gno.land/pkg/keyscli"
  "github.com/gnolang/gno/gnovm/pkg/gnoenv"
  "github.com/gnolang/gno/tm2/pkg/commands"
  "github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
@@ -16,7 +17,7 @@ func main() {
  Remote: "127.0.0.1:26657",
  }
 
- cmd := NewRoot(commands.NewDefaultIO(), baseCfg)
+ cmd := keyscli.NewRootCmd(commands.NewDefaultIO(), baseCfg)
  if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
  _, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)
 

diff --git a/gno.land/pkg/integration/testing_integration.go b/gno.land/pkg/integration/testing_integration.go
@@ -10,11 +10,11 @@ import (
  "strings"
  "testing"
 
+ "github.com/gnolang/gno/gno.land/pkg/keyscli"
  "github.com/gnolang/gno/gnovm/pkg/gnoenv"
  "github.com/gnolang/gno/tm2/pkg/bft/node"
  "github.com/gnolang/gno/tm2/pkg/commands"
  "github.com/gnolang/gno/tm2/pkg/crypto/keys"
- "github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
  "github.com/gnolang/gno/tm2/pkg/log"
  "github.com/rogpeppe/go-internal/testscript"
 )
@@ -181,7 +181,7 @@ func setupGnolandTestScript(t *testing.T, txtarDir string) testscript.Params {
  io := commands.NewTestIO()
  io.SetOut(commands.WriteNopCloser(ts.Stdout()))
  io.SetErr(commands.WriteNopCloser(ts.Stderr()))
- cmd := client.NewRootCmd(io)
+ cmd := keyscli.NewRootCmd(io)
 
  io.SetIn(strings.NewReader("\n")) // Inject empty password to stdin.
  defaultArgs := []string{

diff --git a/gno.land/cmd/gnokey/addpkg.go → gno.land/pkg/keyscli/addpkg.go b/gno.land/cmd/gnokey/addpkg.go → gno.land/pkg/keyscli/addpkg.go
@@ -1,4 +1,4 @@
-package main
+package keyscli
 
 // TODO: move most of the logic in ROOT/gno.land/...
 

diff --git a/gno.land/cmd/gnokey/call.go → gno.land/pkg/keyscli/call.go b/gno.land/cmd/gnokey/call.go → gno.land/pkg/keyscli/call.go
@@ -1,4 +1,4 @@
-package main
+package keyscli
 
 import (
  "context"

diff --git a/gno.land/cmd/gnokey/maketx.go → gno.land/pkg/keyscli/maketx.go b/gno.land/cmd/gnokey/maketx.go → gno.land/pkg/keyscli/maketx.go
@@ -1,4 +1,4 @@
-package main
+package keyscli
 
 import (
  "flag"

diff --git a/gno.land/cmd/gnokey/root.go → gno.land/pkg/keyscli/root.go b/gno.land/cmd/gnokey/root.go → gno.land/pkg/keyscli/root.go
@@ -1,5 +1,5 @@
 // Dedicated to my love, Lexi.
-package main
+package keyscli
 
 import (
  "github.com/gnolang/gno/tm2/pkg/commands"
@@ -9,7 +9,7 @@ import (
  "github.com/peterbourgon/ff/v3/fftoml"
 )
 
-func NewRoot(io commands.IO, base client.BaseOptions) *commands.Command {
+func NewRootCmd(io commands.IO, base client.BaseOptions) *commands.Command {
  cfg := &client.BaseCfg{
  BaseOptions: base,
  }
@@ -39,7 +39,7 @@ func NewRoot(io commands.IO, base client.BaseOptions) *commands.Command {
  client.NewQueryCmd(cfg, io),
  client.NewBroadcastCmd(cfg, io),
 
- // Use custom MakeTX command
+ // Custom MakeTX command
  NewMakeTxCmd(cfg, io),
  )
 

diff --git a/gno.land/cmd/gnokey/run.go → gno.land/pkg/keyscli/run.go b/gno.land/cmd/gnokey/run.go → gno.land/pkg/keyscli/run.go
@@ -1,4 +1,4 @@
-package main
+package keyscli
 
 import (
  "context"