bf11b1bf1f
## Description Draft of: #9705 Started off with changing codec `MarshalYaml` function to directly go from JSON to yaml using the new library. Replaced the only usage of UnmarshalYaml per request. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [x] reviewed state machine logic - [x] reviewed API design and naming - [x] reviewed documentation is accurate - [x] reviewed tests and test coverage - [x] manually tested (if applicable)
70 lines
1.3 KiB
Go
70 lines
1.3 KiB
Go
package keys
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
|
|
"sigs.k8s.io/yaml"
|
|
|
|
cryptokeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
|
|
)
|
|
|
|
// available output formats.
|
|
const (
|
|
OutputFormatText = "text"
|
|
OutputFormatJSON = "json"
|
|
)
|
|
|
|
type bechKeyOutFn func(k *cryptokeyring.Record) (cryptokeyring.KeyOutput, error)
|
|
|
|
func printKeyringRecord(w io.Writer, k *cryptokeyring.Record, bechKeyOut bechKeyOutFn, output string) {
|
|
ko, err := bechKeyOut(k)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
switch output {
|
|
case OutputFormatText:
|
|
printTextRecords(w, []cryptokeyring.KeyOutput{ko})
|
|
|
|
case OutputFormatJSON:
|
|
out, err := KeysCdc.MarshalJSON(ko)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
fmt.Fprintln(w, string(out))
|
|
}
|
|
}
|
|
|
|
func printKeyringRecords(w io.Writer, records []*cryptokeyring.Record, output string) {
|
|
kos, err := cryptokeyring.MkAccKeysOutput(records)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
switch output {
|
|
case OutputFormatText:
|
|
printTextRecords(w, kos)
|
|
|
|
case OutputFormatJSON:
|
|
// TODO https://github.com/cosmos/cosmos-sdk/issues/8046
|
|
// Replace AminoCdc with Proto JSON
|
|
out, err := KeysCdc.MarshalJSON(kos)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
fmt.Fprintf(w, "%s", out)
|
|
}
|
|
}
|
|
|
|
func printTextRecords(w io.Writer, kos []cryptokeyring.KeyOutput) {
|
|
out, err := yaml.Marshal(&kos)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
fmt.Fprintln(w, string(out))
|
|
}
|