fix tests

tools/confix/cmd/condiff/main.go

@@ -3,11 +3,41 @@ package main
 import (
 	"os"
 
-	confixcmd "cosmossdk.io/tools/confix/cmd"
+	"cosmossdk.io/tools/confix"
+	"github.com/spf13/cobra"
 )
 
 func main() {
-	if err := confixcmd.DiffCommand().Execute(); err != nil {
+	cmd := &cobra.Command{
+		Use:   "condiff f1 f2",
+		Short: "Diff the keyspaces of the TOML documents in files f1 and f2",
+		Long: `Diff the keyspaces of the TOML documents in files f1 and f2.
+The output prints one line per key that differs:
+
+   -S name    -- section exists in f1 but not f2
+   +S name    -- section exists in f2 but not f1
+   -M name    -- mapping exists in f1 but not f2
+   +M name    -- mapping exists in f2 but not f1
+
+Comments, order, and values are ignored for comparison purposes.`,
+		Args: cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			lhs, err := confix.LoadConfig(args[0])
+			if err != nil {
+				return err
+			}
+
+			rhs, err := confix.LoadConfig(args[1])
+			if err != nil {
+				return err
+			}
+
+			confix.PrintDiff(cmd.OutOrStdout(), confix.DiffKeys(lhs, rhs))
+			return nil
+		},
+	}
+
+	if err := cmd.Execute(); err != nil {
 		os.Exit(1)
 	}
 }

tools/confix/cmd/config.go

@@ -14,6 +14,7 @@ func ConfigCommand() *cobra.Command {
 
 	cmd.AddCommand(
 		MigrateCommand(),
+		DiffCommand(),
 		GetCommand(),
 		SetCommand(),
 	)

tools/confix/cmd/diff.go

@@ -1,36 +1,16 @@
 package cmd
 
 import (
-	"cosmossdk.io/tools/confix"
 	"github.com/spf13/cobra"
 )
 
 func DiffCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:   "condiff f1 f2",
-		Short: "Diff the keyspaces of the TOML documents in files f1 and f2",
-		Long: `Diff the keyspaces of the TOML documents in files f1 and f2.
-The output prints one line per key that differs:
-
-   -S name    -- section exists in f1 but not f2
-   +S name    -- section exists in f2 but not f1
-   -M name    -- mapping exists in f1 but not f2
-   +M name    -- mapping exists in f2 but not f1
-
-Comments, order, and values are ignored for comparison purposes.`,
-		Args: cobra.ExactArgs(2),
+		Use:   "diff [config]",
+		Short: "Display the diff between the current config and the SDK default config",
+		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			lhs, err := confix.LoadConfig(args[0])
-			if err != nil {
-				return err
-			}
-
-			rhs, err := confix.LoadConfig(args[1])
-			if err != nil {
-				return err
-			}
-
-			confix.PrintDiff(cmd.OutOrStdout(), confix.DiffDocs(lhs, rhs))
+			// TODO to implement in the next PR
 			return nil
 		},
 	}

tools/confix/cmd/migrate.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"cosmossdk.io/tools/confix"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -50,7 +49,7 @@ In case of any error in updating the file, no output is written.`,
 
 			ctx := context.Background()
 			if FlagVerbose {
-				ctx = confix.WithLogWriter(ctx, os.Stderr)
+				ctx = confix.WithLogWriter(ctx, cmd.ErrOrStderr())
 			}
 
 			outputPath := filename

tools/confix/cmd/migrate_test.go

@@ -2,6 +2,7 @@ package cmd_test
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"cosmossdk.io/tools/confix/cmd"
@@ -25,10 +26,11 @@ func TestMigradeCmd(t *testing.T) {
 	assert.ErrorContains(t, err, "no such file or directory")
 
 	// try to migrate from client.toml it should fail without --skip-validate
-	_, err = clitestutil.ExecTestCLICmd(clientCtx, cmd.MigrateCommand(), []string{"v0.45", fmt.Sprintf("%s/config/client.toml", t.TempDir())})
+	_, err = clitestutil.ExecTestCLICmd(clientCtx, cmd.MigrateCommand(), []string{"v0.46", fmt.Sprintf("%s/config/client.toml", clientCtx.HomeDir)})
 	assert.ErrorContains(t, err, "failed to migrate config")
 
 	// try to migrate from client.toml - it should work and give us a big diff
-	_, err = clitestutil.ExecTestCLICmd(clientCtx, cmd.MigrateCommand(), []string{"v0.45", fmt.Sprintf("%s/config/client.toml", t.TempDir()), "--skip-validate"})
+	out, err := clitestutil.ExecTestCLICmd(clientCtx, cmd.MigrateCommand(), []string{"v0.46", fmt.Sprintf("%s/config/client.toml", clientCtx.HomeDir), "--skip-validate", "--verbose"})
 	assert.NilError(t, err)
+	assert.Assert(t, strings.Contains(out.String(), "add app-db-backend key"))
 }

tools/confix/cmd/mutate.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"strings"
 
 	"cosmossdk.io/tools/confix"
@@ -69,7 +68,7 @@ func SetCommand() *cobra.Command {
 
 			ctx := cmd.Context()
 			if FlagVerbose {
-				ctx = confix.WithLogWriter(ctx, os.Stderr)
+				ctx = confix.WithLogWriter(ctx, cmd.ErrOrStderr())
 			}
 
 			return confix.Upgrade(ctx, plan, filename, outputPath, FlagSkipValidate)

tools/confix/diff.go

@@ -28,9 +28,9 @@ type Diff struct {
 	KV KV
 }
 
-// DiffDocs diffs the keyspaces of the TOML documents in files lhs and rhs.
+// DiffKeys diffs the keyspaces of the TOML documents in files lhs and rhs.
 // Comments, order, and values are ignored for comparison purposes.
-func DiffDocs(lhs, rhs *tomledit.Document) []Diff {
+func DiffKeys(lhs, rhs *tomledit.Document) []Diff {
 	diff := diffSections(lhs.Global, rhs.Global)
 
 	lsec, rsec := lhs.Sections, rhs.Sections

tools/confix/migrations.go

@@ -49,7 +49,7 @@ func PlanBuilder(from *tomledit.Document, to string) transform.Plan {
 
 	deletedSections := map[string]bool{}
 
-	diffs := DiffDocs(from, target)
+	diffs := DiffKeys(from, target)
 	for _, diff := range diffs {
 		diff := diff
 		kv := diff.KV