refactor: remove client/keys.KeysCdc (#13781)

cosmos · Nov 9, 2022 · f8e40d7 · f8e40d7
1 parent 22f3261
commit f8e40d7
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 129 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,6 +85,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * [#13236](https://github.com/cosmos/cosmos-sdk/pull/13236) Integrate Filter Logging
 * [#13528](https://github.com/cosmos/cosmos-sdk/pull/13528) Update `ValidateMemoDecorator` to only check memo against `MaxMemoCharacters` param when a memo is present.
 * [#13651](https://github.com/cosmos/cosmos-sdk/pull/13651) Update `server/config/config.GetConfig` function.
+* [#13781](https://github.com/cosmos/cosmos-sdk/pull/13781) Remove `client/keys.KeysCdc`.
 * [#13803](https://github.com/cosmos/cosmos-sdk/pull/13803) Add an error log if iavl set operation failed.
 
 ### State Machine Breaking

diff --git a/client/keys/add.go b/client/keys/add.go
@@ -3,6 +3,7 @@ package keys
 import (
 	"bufio"
 	"bytes"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"sort"
@@ -313,7 +314,7 @@ func printCreate(cmd *cobra.Command, k *keyring.Record, showMnemonic bool, mnemo
 			out.Mnemonic = mnemonic
 		}
 
-		jsonString, err := KeysCdc.MarshalJSON(out)
+		jsonString, err := json.Marshal(out)
 		if err != nil {
 			return err
 		}

diff --git a/client/keys/codec.go b/client/keys/codec.go
diff --git a/client/keys/codec_test.go b/client/keys/codec_test.go
diff --git a/client/keys/parse.go b/client/keys/parse.go
@@ -2,6 +2,7 @@ package keys
 
 import (
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -140,7 +141,7 @@ func displayParseKeyInfo(w io.Writer, stringer fmt.Stringer, output string) {
 		out, err = yaml.Marshal(&stringer)
 
 	case OutputFormatJSON:
-		out, err = KeysCdc.MarshalJSON(stringer)
+		out, err = json.Marshal(&stringer)
 	}
 
 	if err != nil {

diff --git a/client/keys/utils.go b/client/keys/utils.go
@@ -1,6 +1,7 @@
 package keys
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
 
@@ -30,7 +31,7 @@ func printKeyringRecord(w io.Writer, k *cryptokeyring.Record, bechKeyOut bechKey
 		}
 
 	case OutputFormatJSON:
-		out, err := KeysCdc.MarshalJSON(ko)
+		out, err := json.Marshal(ko)
 		if err != nil {
 			return err
 		}
@@ -57,8 +58,7 @@ func printKeyringRecords(w io.Writer, records []*cryptokeyring.Record, output st
 
 	case OutputFormatJSON:
 		// TODO https://github.com/cosmos/cosmos-sdk/issues/8046
-		// Replace AminoCdc with Proto JSON
-		out, err := KeysCdc.MarshalJSON(kos)
+		out, err := json.Marshal(kos)
 		if err != nil {
 			return err
 		}