refactor!: move tm2/keys/client into gno.land/pkg/keyscli

contribs/gnokeykc/main.go

@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/commands"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/zalando/go-keyring"
 )
 
 func main() {
 	stdio := commands.NewDefaultIO()
 	wrappedio := &wrappedIO{IO: stdio}
-	cmd := client.NewRootCmd(wrappedio)
+	cmd := keyscli.NewRootCmd(wrappedio)
 	cmd.AddSubCommands(newKcCmd(stdio))
 
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {

gno.land/cmd/genesis/validator_add_test.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"testing"
 
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 	"github.com/gnolang/gno/tm2/pkg/crypto/hd"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/gnolang/gno/tm2/pkg/crypto/secp256k1"
 	"github.com/gnolang/gno/tm2/pkg/testutils"
 	"github.com/stretchr/testify/assert"
@@ -21,11 +21,10 @@ import (
 func getDummyKey(t *testing.T) crypto.PubKey {
 	t.Helper()
 
-	mnemonic, err := client.GenerateMnemonic(256)
+	mnemonic, err := keyscli.GenerateMnemonic(256)
 	require.NoError(t, err)
 
 	seed := bip39.NewSeed(mnemonic, "")
-
 	return generateKeyFromSeed(seed, 0).PubKey()
 }
 

gno.land/cmd/gnofaucet/serve.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	keyscli "github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/sdk/bank"
 	"github.com/gnolang/gno/tm2/pkg/std"
@@ -35,7 +35,7 @@ type SiteVerifyResponse struct {
 }
 
 type config struct {
-	client.BaseOptions // home, ...
+	keyscli.BaseOptions // home, ...
 
 	ChainID               string
 	GasWanted             int64
@@ -69,21 +69,21 @@ func (c *config) RegisterFlags(fs *flag.FlagSet) {
 	fs.StringVar(
 		&c.BaseOptions.Home,
 		"home",
-		client.DefaultBaseOptions.Home,
+		keyscli.DefaultBaseOptions.Home,
 		"home directory",
 	)
 
 	fs.StringVar(
 		&c.BaseOptions.Remote,
 		"remote",
-		client.DefaultBaseOptions.Remote,
+		keyscli.DefaultBaseOptions.Remote,
 		"remote node URL",
 	)
 
 	fs.BoolVar(
 		&c.BaseOptions.Quiet,
 		"quiet",
-		client.DefaultBaseOptions.Quiet,
+		keyscli.DefaultBaseOptions.Quiet,
 		"for parsing output",
 	)
 

gno.land/cmd/gnokey/main.go

@@ -5,18 +5,18 @@
 	"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"
 )
 
 func main() {
-	baseCfg := client.BaseOptions{
+	baseCfg := keyscli.BaseOptions{
 		Home:   gnoenv.HomeDir(),
 		Remote: "127.0.0.1:26657",
 	}
 
-	cmd := client.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
+	cmd := keyscli.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)
 

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{

tm2/pkg/crypto/keys/client/add.go → gno.land/pkg/keyscli/add.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/add_test.go → gno.land/pkg/keyscli/add_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"fmt"

tm2/pkg/crypto/keys/client/addpkg.go → gno.land/pkg/keyscli/addpkg.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 // TODO: move most of the logic in ROOT/gno.land/...
 

tm2/pkg/crypto/keys/client/broadcast.go → gno.land/pkg/keyscli/broadcast.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/call.go → gno.land/pkg/keyscli/call.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/common.go → gno.land/pkg/keyscli/common.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 type BaseOptions struct {
 	Home                  string

tm2/pkg/crypto/keys/client/delete.go → gno.land/pkg/keyscli/delete.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/delete_test.go → gno.land/pkg/keyscli/delete_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"strings"

tm2/pkg/crypto/keys/client/export.go → gno.land/pkg/keyscli/export.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/export_test.go → gno.land/pkg/keyscli/export_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"fmt"

tm2/pkg/crypto/keys/client/generate.go → gno.land/pkg/keyscli/generate.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/generate_test.go → gno.land/pkg/keyscli/generate_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"strings"

tm2/pkg/crypto/keys/client/helper.go → gno.land/pkg/keyscli/helper.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import "github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 

tm2/pkg/crypto/keys/client/import.go → gno.land/pkg/keyscli/import.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/import_test.go → gno.land/pkg/keyscli/import_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"fmt"

tm2/pkg/crypto/keys/client/list.go → gno.land/pkg/keyscli/list.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/list_test.go → gno.land/pkg/keyscli/list_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"testing"

tm2/pkg/crypto/keys/client/maketx.go → gno.land/pkg/keyscli/maketx.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"flag"

tm2/pkg/crypto/keys/client/query.go → gno.land/pkg/keyscli/query.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/root.go → gno.land/pkg/keyscli/root.go

@@ -1,5 +1,5 @@
 // Dedicated to my love, Lexi.
-package client
+package keyscli
 
 import (
 	"flag"

tm2/pkg/crypto/keys/client/run.go → gno.land/pkg/keyscli/run.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/send.go → gno.land/pkg/keyscli/send.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/sign.go → gno.land/pkg/keyscli/sign.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/sign_test.go → gno.land/pkg/keyscli/sign_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"fmt"

tm2/pkg/crypto/keys/client/verify.go → gno.land/pkg/keyscli/verify.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"context"

tm2/pkg/crypto/keys/client/verify_test.go → gno.land/pkg/keyscli/verify_test.go

@@ -1,4 +1,4 @@
-package client
+package keyscli
 
 import (
 	"encoding/hex"

tm2/pkg/crypto/keys/client/README.md

@@ -0,0 +1,11 @@
+# keys/client (Deprecated)
+
+## Deprecation Notice
+
+The `keys/client` package has been deprecated. The functionality that was previously offered by this package is now available in `gno.land/pkg/keycli`. This change has been made to streamline the project structure and enhance maintainability.
+
+For more details on this transition, please refer to the following resources:
+- **Issue Discussion**: [Issue #1174](https://github.com/gnolang/gno/issues/1174)
+- **Pull Request**: [PR #1438](https://github.com/gnolang/gno/pull/1438)
+
+If you are still using this `client` package, it is recommended to migrate your code to use `gno.land/pkg/keycli` instead.

tm2/pkg/crypto/keys/client/deprecated.go

@@ -0,0 +1,19 @@
+package client
+
+import "github.com/gnolang/gno/tm2/pkg/commands"
+
+// Deprecated: NewRootCmd is deprecated and has been moved in
+// `gno.land/pkg/keycli`. Please update your code to use the new package. This
+// function now only serves as a placeholder and will panic if called to
+// encourage migration.
+func NewRootCmd(io commands.IO) *commands.Command {
+	panic("NewRootCmd: has been deprecated, use `gno.land/pkg/keycli` instead")
+}
+
+// Deprecated: NewRootCmdWithBaseConfig as has been moved in
+// `gno.land/pkg/keycli`. Please update your code to use the new package. This
+// function now only serves as a placeholder and will panic if called to
+// encourage migration.
+func NewRootCmdWithBaseConfig(io commands.IO, cfg interface{}) *commands.Command {
+	panic("NewRootCmdWithBaseConfig: has been deprecated, use `gno.land/pkg/keycli` instead")
+}