refactor!: move genesis to gnoland genesis (gnolang#1954)

## Description Closes gnolang#1953 This PR moves the `genesis` command suite to be a subcommand of `gnoland`, making it callable with `gnoland genesis`. <details><summary>Contributors' checklist...</summary> - [x] Added new tests, or not needed, or not feasible - [x] Provided an example (e.g. screenshot) to aid review or the PR is self-explanatory - [x] Updated the official documentation or not needed - [x] No breaking changes were made, or a `BREAKING CHANGE: xxx` message was included in the description - [x] Added references to related issues and PRs - [ ] Provided any useful hints for running manual tests - [ ] Added new benchmarks to [generated graphs](https://gnoland.github.io/benchmarks), if any. More info [here](https://github.com/gnolang/gno/blob/master/.benchmarks/README.md). </details>
zivkovicmilos · Apr 19, 2024 · c628334 · c628334
1 parent 7ecc692
commit c628334
Show file tree

Hide file tree

Showing 27 changed files with 68 additions and 23 deletions.
diff --git a/gno.land/Makefile b/gno.land/Makefile
@@ -31,23 +31,21 @@ start.gnoland:; go run ./cmd/gnoland start
 start.gnoweb:; go run ./cmd/gnoweb
 
 .PHONY: build
-build: build.gnoland build.gnokey build.gnoweb build.genesis
+build: build.gnoland build.gnokey build.gnoweb
 
 build.gnoland:;    go build -o build/gnoland   ./cmd/gnoland
 build.gnoweb:;     go build -o build/gnoweb    ./cmd/gnoweb
 build.gnokey:;     go build -o build/gnokey    ./cmd/gnokey
-build.genesis:;    go build -o build/genesis  ./cmd/genesis
 
 run.gnoland:;      go run ./cmd/gnoland start
 run.gnoweb:;       go run ./cmd/gnoweb
 
 .PHONY: install
-install: install.gnoland install.gnoweb install.gnokey install.genesis
+install: install.gnoland install.gnoweb install.gnokey
 
 install.gnoland:;    go install ./cmd/gnoland
 install.gnoweb:;     go install ./cmd/gnoweb
 install.gnokey:;     go install ./cmd/gnokey
-install.genesis:;    go install ./cmd/genesis
 
 .PHONY: fclean
 fclean: clean

diff --git a/gno.land/cmd/genesis/main.go → gno.land/cmd/gnoland/genesis.go b/gno.land/cmd/genesis/main.go → gno.land/cmd/gnoland/genesis.go
@@ -1,25 +1,18 @@
 package main
 
 import (
-	"context"
 	"flag"
-	"os"
 
 	"github.com/gnolang/gno/tm2/pkg/commands"
 )
 
-func main() {
-	io := commands.NewDefaultIO()
-	cmd := newRootCmd(io)
-
-	cmd.Execute(context.Background(), os.Args[1:])
-}
-
-func newRootCmd(io commands.IO) *commands.Command {
+func newGenesisCmd(io commands.IO) *commands.Command {
 	cmd := commands.NewCommand(
 		commands.Metadata{
-			ShortUsage: "<subcommand> [flags] [<arg>...]",
-			LongHelp:   "Gno Genesis manipulation suite",
+			Name:       "genesis",
+			ShortUsage: "genesis <subcommand> [flags] [<arg>...]",
+			ShortHelp:  "gno genesis manipulation suite",
+			LongHelp:   "Gno genesis.json manipulation suite, for managing genesis parameters",
 		},
 		commands.NewEmptyConfig(),
 		commands.HelpExec,

diff --git a/gno.land/cmd/genesis/balances.go → gno.land/cmd/gnoland/genesis_balances.go b/gno.land/cmd/genesis/balances.go → gno.land/cmd/gnoland/genesis_balances.go
diff --git a/gno.land/cmd/genesis/balances_add.go → gno.land/cmd/gnoland/genesis_balances_add.go b/gno.land/cmd/genesis/balances_add.go → gno.land/cmd/gnoland/genesis_balances_add.go
diff --git a/gno.land/cmd/genesis/balances_add_test.go → .../cmd/gnoland/genesis_balances_add_test.go b/gno.land/cmd/genesis/balances_add_test.go → .../cmd/gnoland/genesis_balances_add_test.go
@@ -27,6 +27,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -50,6 +51,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -67,6 +69,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -92,6 +95,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -181,6 +185,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -280,6 +285,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",
@@ -353,6 +359,7 @@ func TestGenesis_Balances_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"add",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/balances_export.go → ...nd/cmd/gnoland/genesis_balances_export.go b/gno.land/cmd/genesis/balances_export.go → ...nd/cmd/gnoland/genesis_balances_export.go
diff --git a/gno.land/cmd/genesis/balances_export_test.go → ...d/gnoland/genesis_balances_export_test.go b/gno.land/cmd/genesis/balances_export_test.go → ...d/gnoland/genesis_balances_export_test.go
@@ -41,6 +41,7 @@ func TestGenesis_Balances_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"export",
 			"--genesis-path",
@@ -65,6 +66,7 @@ func TestGenesis_Balances_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"export",
 			"--genesis-path",
@@ -91,6 +93,7 @@ func TestGenesis_Balances_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"export",
 			"--genesis-path",
@@ -124,6 +127,7 @@ func TestGenesis_Balances_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"export",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/balances_remove.go → ...nd/cmd/gnoland/genesis_balances_remove.go b/gno.land/cmd/genesis/balances_remove.go → ...nd/cmd/gnoland/genesis_balances_remove.go
diff --git a/gno.land/cmd/genesis/balances_remove_test.go → ...d/gnoland/genesis_balances_remove_test.go b/gno.land/cmd/genesis/balances_remove_test.go → ...d/gnoland/genesis_balances_remove_test.go
@@ -20,6 +20,7 @@ func TestGenesis_Balances_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"remove",
 			"--genesis-path",
@@ -46,6 +47,7 @@ func TestGenesis_Balances_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"remove",
 			"--genesis-path",
@@ -83,6 +85,7 @@ func TestGenesis_Balances_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"remove",
 			"--genesis-path",
@@ -125,6 +128,7 @@ func TestGenesis_Balances_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"balances",
 			"remove",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/generate.go → gno.land/cmd/gnoland/genesis_generate.go b/gno.land/cmd/genesis/generate.go → gno.land/cmd/gnoland/genesis_generate.go
diff --git a/gno.land/cmd/genesis/generate_test.go → ...land/cmd/gnoland/genesis_generate_test.go b/gno.land/cmd/genesis/generate_test.go → ...land/cmd/gnoland/genesis_generate_test.go
@@ -27,6 +27,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--output-path",
 			genesisPath,
@@ -60,6 +61,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--chain-id",
 			chainID,
@@ -91,6 +93,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--block-max-tx-bytes",
 			fmt.Sprintf("%d", blockMaxTxBytes),
@@ -126,6 +129,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--block-max-data-bytes",
 			fmt.Sprintf("%d", blockMaxDataBytes),
@@ -161,6 +165,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--block-max-gas",
 			fmt.Sprintf("%d", blockMaxGas),
@@ -196,6 +201,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--block-time-iota",
 			fmt.Sprintf("%d", blockTimeIota),
@@ -231,6 +237,7 @@ func TestGenesis_Generate(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"generate",
 			"--chain-id",
 			invalidChainID,

diff --git a/gno.land/cmd/genesis/txs.go → gno.land/cmd/gnoland/genesis_txs.go b/gno.land/cmd/genesis/txs.go → gno.land/cmd/gnoland/genesis_txs.go
diff --git a/gno.land/cmd/genesis/txs_add.go → gno.land/cmd/gnoland/genesis_txs_add.go b/gno.land/cmd/genesis/txs_add.go → gno.land/cmd/gnoland/genesis_txs_add.go
diff --git a/gno.land/cmd/genesis/txs_add_test.go → gno.land/cmd/gnoland/genesis_txs_add_test.go b/gno.land/cmd/genesis/txs_add_test.go → gno.land/cmd/gnoland/genesis_txs_add_test.go
@@ -71,6 +71,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",
@@ -94,6 +95,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",
@@ -118,6 +120,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",
@@ -141,6 +144,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",
@@ -180,6 +184,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",
@@ -238,6 +243,7 @@ func TestGenesis_Txs_Add(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"add",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/txs_export.go → gno.land/cmd/gnoland/genesis_txs_export.go b/gno.land/cmd/genesis/txs_export.go → gno.land/cmd/gnoland/genesis_txs_export.go
diff --git a/gno.land/cmd/genesis/txs_export_test.go → ...nd/cmd/gnoland/genesis_txs_export_test.go b/gno.land/cmd/genesis/txs_export_test.go → ...nd/cmd/gnoland/genesis_txs_export_test.go
@@ -23,6 +23,7 @@ func TestGenesis_Txs_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"export",
 			"--genesis-path",
@@ -47,6 +48,7 @@ func TestGenesis_Txs_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"export",
 			"--genesis-path",
@@ -73,6 +75,7 @@ func TestGenesis_Txs_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"export",
 			"--genesis-path",
@@ -106,6 +109,7 @@ func TestGenesis_Txs_Export(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"export",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/txs_remove.go → gno.land/cmd/gnoland/genesis_txs_remove.go b/gno.land/cmd/genesis/txs_remove.go → gno.land/cmd/gnoland/genesis_txs_remove.go
diff --git a/gno.land/cmd/genesis/txs_remove_test.go → ...nd/cmd/gnoland/genesis_txs_remove_test.go b/gno.land/cmd/genesis/txs_remove_test.go → ...nd/cmd/gnoland/genesis_txs_remove_test.go
@@ -21,6 +21,7 @@ func TestGenesis_Txs_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"remove",
 			"--genesis-path",
@@ -45,6 +46,7 @@ func TestGenesis_Txs_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"remove",
 			"--genesis-path",
@@ -73,6 +75,7 @@ func TestGenesis_Txs_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"remove",
 			"--genesis-path",
@@ -105,6 +108,7 @@ func TestGenesis_Txs_Remove(t *testing.T) {
 		// Create the command
 		cmd := newRootCmd(commands.NewTestIO())
 		args := []string{
+			"genesis",
 			"txs",
 			"remove",
 			"--genesis-path",

diff --git a/gno.land/cmd/genesis/validator.go → gno.land/cmd/gnoland/genesis_validator.go b/gno.land/cmd/genesis/validator.go → gno.land/cmd/gnoland/genesis_validator.go
diff --git a/gno.land/cmd/genesis/validator_add.go → ...land/cmd/gnoland/genesis_validator_add.go b/gno.land/cmd/genesis/validator_add.go → ...land/cmd/gnoland/genesis_validator_add.go
@@ -13,10 +13,10 @@ import (
 )
 
 var (
-	errInvalidPower      = errors.New("invalid validator power")
-	errInvalidName       = errors.New("invalid validator name")
-	errPublicKeyMismatch = errors.New("provided public key and address do not match")
-	errAddressPresent    = errors.New("validator with same address already present in genesis.json")
+	errInvalidPower             = errors.New("invalid validator power")
+	errInvalidName              = errors.New("invalid validator name")
+	errPublicKeyAddressMismatch = errors.New("provided public key and address do not match")
+	errAddressPresent           = errors.New("validator with same address already present in genesis.json")
 )
 
 type validatorAddCfg struct {
@@ -89,7 +89,7 @@ func execValidatorAdd(cfg *validatorAddCfg, io commands.IO) error {
 
 	// Check the name
 	if cfg.name == "" {
-		return errors.New("invalid validator name")
+		return errInvalidName
 	}
 
 	// Check the public key
@@ -100,7 +100,7 @@ func execValidatorAdd(cfg *validatorAddCfg, io commands.IO) error {
 
 	// Check the public key matches the address
 	if pubKey.Address() != address {
-		return errors.New("provided public key and address do not match")
+		return errPublicKeyAddressMismatch
 	}
 
 	validator := types.GenesisValidator{