Fully removed usage of gopkg yaml

cosmos · Jul 30, 2021 · 985390d · 985390d
1 parent d30726f
commit 985390d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 28 deletions.
diff --git a/client/context.go b/client/context.go
@@ -1,13 +1,12 @@
 package client
 
 import (
-	"encoding/json"
 	"io"
 	"os"
 
 	"github.com/spf13/viper"
 
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/pkg/errors"
@@ -277,15 +276,7 @@ func (ctx Context) PrintObjectLegacy(toPrint interface{}) error {
 
 func (ctx Context) printOutput(out []byte) error {
 	if ctx.OutputFormat == "text" {
-		// handle text format by decoding and re-encoding JSON as YAML
-		var j interface{}
-
-		err := json.Unmarshal(out, &j)
-		if err != nil {
-			return err
-		}
-
-		out, err = yaml.Marshal(j)
+		out, err := yaml.JSONToYAML(out)
 		if err != nil {
 			return err
 		}

diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
 	google.golang.org/grpc v1.39.0
 	google.golang.org/protobuf v1.27.1
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	nhooyr.io/websocket v1.8.6 // indirect
 	sigs.k8s.io/yaml v1.2.0
 )

diff --git a/types/address.go b/types/address.go
@@ -10,8 +10,7 @@ import (
 	"sync"
 
 	"github.com/hashicorp/golang-lru/simplelru"
-	yaml "gopkg.in/yaml.v2"
-	sigsyaml "sigs.k8s.io/yaml"
+	"sigs.k8s.io/yaml"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/internal/conv"
@@ -117,10 +116,6 @@ var _ Address = AccAddress{}
 var _ Address = ValAddress{}
 var _ Address = ConsAddress{}
 
-var _ yaml.Marshaler = AccAddress{}
-var _ yaml.Marshaler = ValAddress{}
-var _ yaml.Marshaler = ConsAddress{}
-
 // ----------------------------------------------------------------------------
 // account
 // ----------------------------------------------------------------------------
@@ -238,7 +233,7 @@ func (aa *AccAddress) UnmarshalJSON(data []byte) error {
 // UnmarshalYAML unmarshals from JSON assuming Bech32 encoding.
 func (aa *AccAddress) UnmarshalYAML(data []byte) error {
 	var s string
-	err := sigsyaml.Unmarshal(data, &s)
+	err := yaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}
@@ -388,7 +383,7 @@ func (va *ValAddress) UnmarshalJSON(data []byte) error {
 func (va *ValAddress) UnmarshalYAML(data []byte) error {
 	var s string
 
-	err := sigsyaml.Unmarshal(data, &s)
+	err := yaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}
@@ -543,7 +538,7 @@ func (ca *ConsAddress) UnmarshalJSON(data []byte) error {
 func (ca *ConsAddress) UnmarshalYAML(data []byte) error {
 	var s string
 
-	err := sigsyaml.Unmarshal(data, &s)
+	err := yaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}

diff --git a/types/address_test.go b/types/address_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"

diff --git a/types/decimal_test.go b/types/decimal_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/legacy"

diff --git a/x/evidence/migrations/v038/types.go b/x/evidence/migrations/v038/types.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/evidence/types/evidence.go b/x/evidence/types/evidence.go
@@ -7,7 +7,7 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"

diff --git a/x/genutil/types/genesis_state.go b/x/genutil/types/genesis_state.go
@@ -69,7 +69,6 @@ func SetGenesisStateInAppState(
 //
 // NOTE: The pubkey input is this machines pubkey.
 func GenesisStateFromGenDoc(genDoc tmtypes.GenesisDoc) (genesisState map[string]json.RawMessage, err error) {
-
 	if err = json.Unmarshal(genDoc.AppState, &genesisState); err != nil {
 		return genesisState, err
 	}

diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go
@@ -9,7 +9,7 @@ import (
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"