diff --git a/changelog.md b/changelog.md index 617ab6854e..d46ab575da 100644 --- a/changelog.md +++ b/changelog.md @@ -19,6 +19,7 @@ - [#3976](https://github.com/ignite/cli/pull/3976) Remove error checks for Cobra command value get calls - [#3983](https://github.com/ignite/cli/pull/3983) Bump `cosmos-sdk` to `v0.50.4` and `ibc-go` to `v8.1.0` - [#4002](https://github.com/ignite/cli/pull/4002) Bump buf build +- [#4008](https://github.com/ignite/cli/pull/4008) Rename `pkg/yaml` to `pkg/xyaml` ### Fixes diff --git a/ignite/config/chain/base/config.go b/ignite/config/chain/base/config.go index 3475e802f1..60699bca12 100644 --- a/ignite/config/chain/base/config.go +++ b/ignite/config/chain/base/config.go @@ -4,7 +4,7 @@ import ( "github.com/imdario/mergo" "github.com/ignite/cli/v28/ignite/config/chain/version" - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" ) var ( diff --git a/ignite/config/chain/v1/validator.go b/ignite/config/chain/v1/validator.go index 7af0b615c5..8bd1b0754f 100644 --- a/ignite/config/chain/v1/validator.go +++ b/ignite/config/chain/v1/validator.go @@ -1,7 +1,7 @@ package v1 import ( - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" ) // Validator holds info related to validator settings. diff --git a/ignite/config/chain/v1/validator_servers_test.go b/ignite/config/chain/v1/validator_servers_test.go index c711f43603..e28f4a7b74 100644 --- a/ignite/config/chain/v1/validator_servers_test.go +++ b/ignite/config/chain/v1/validator_servers_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" v1 "github.com/ignite/cli/v28/ignite/config/chain/v1" - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" ) func TestValidatorGetServers(t *testing.T) { diff --git a/ignite/pkg/yaml/map.go b/ignite/pkg/xyaml/map.go similarity index 98% rename from ignite/pkg/yaml/map.go rename to ignite/pkg/xyaml/map.go index 5385f0e64a..fa4be088f1 100644 --- a/ignite/pkg/yaml/map.go +++ b/ignite/pkg/xyaml/map.go @@ -1,4 +1,4 @@ -package yaml +package xyaml // Map defines a map type that uses strings as key value. // The map implements the Unmarshaller interface to convert diff --git a/ignite/pkg/yaml/map_test.go b/ignite/pkg/xyaml/map_test.go similarity index 91% rename from ignite/pkg/yaml/map_test.go rename to ignite/pkg/xyaml/map_test.go index afc87e6e4b..7b9e95c1ec 100644 --- a/ignite/pkg/yaml/map_test.go +++ b/ignite/pkg/xyaml/map_test.go @@ -1,4 +1,4 @@ -package yaml_test +package xyaml_test import ( "testing" @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" ) func TestUnmarshalWithCustomMapType(t *testing.T) { diff --git a/ignite/pkg/yaml/yaml.go b/ignite/pkg/xyaml/yaml.go similarity index 98% rename from ignite/pkg/yaml/yaml.go rename to ignite/pkg/xyaml/yaml.go index edeb602257..5f1ad0c6c9 100644 --- a/ignite/pkg/yaml/yaml.go +++ b/ignite/pkg/xyaml/yaml.go @@ -1,4 +1,4 @@ -package yaml +package xyaml import ( "context" diff --git a/ignite/pkg/yaml/yaml_test.go b/ignite/pkg/xyaml/yaml_test.go similarity index 99% rename from ignite/pkg/yaml/yaml_test.go rename to ignite/pkg/xyaml/yaml_test.go index 21c7848b8d..b5810901dc 100644 --- a/ignite/pkg/yaml/yaml_test.go +++ b/ignite/pkg/xyaml/yaml_test.go @@ -1,4 +1,4 @@ -package yaml +package xyaml import ( "context" diff --git a/integration/ibc/cmd_relayer_test.go b/integration/ibc/cmd_relayer_test.go index 30fb207fd9..74d0fdd7fa 100644 --- a/integration/ibc/cmd_relayer_test.go +++ b/integration/ibc/cmd_relayer_test.go @@ -25,7 +25,7 @@ import ( "github.com/ignite/cli/v28/ignite/pkg/cmdrunner" "github.com/ignite/cli/v28/ignite/pkg/cmdrunner/step" "github.com/ignite/cli/v28/ignite/pkg/goanalysis" - yamlmap "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" envtest "github.com/ignite/cli/v28/integration" ) @@ -66,21 +66,21 @@ var ( Coins: []string{"500token", "100000000stake"}, Host: ":4501", }, - Genesis: yamlmap.Map{"chain_id": "mars-1"}, + Genesis: xyaml.Map{"chain_id": "mars-1"}, }, Validators: []v1.Validator{ { Name: "alice", Bonded: "100000000stake", - Client: yamlmap.Map{"keyring-backend": keyring.BackendTest}, - App: yamlmap.Map{ - "api": yamlmap.Map{"address": ":1318"}, - "grpc": yamlmap.Map{"address": ":9092"}, - "grpc-web": yamlmap.Map{"address": ":9093"}, + Client: xyaml.Map{"keyring-backend": keyring.BackendTest}, + App: xyaml.Map{ + "api": xyaml.Map{"address": ":1318"}, + "grpc": xyaml.Map{"address": ":9092"}, + "grpc-web": xyaml.Map{"address": ":9093"}, }, - Config: yamlmap.Map{ - "p2p": yamlmap.Map{"laddr": ":26658"}, - "rpc": yamlmap.Map{"laddr": ":26658", "pprof_laddr": ":6061"}, + Config: xyaml.Map{ + "p2p": xyaml.Map{"laddr": ":26658"}, + "rpc": xyaml.Map{"laddr": ":26658", "pprof_laddr": ":6061"}, }, Home: "$HOME/.mars", }, @@ -117,21 +117,21 @@ var ( Coins: []string{"500token", "100000000stake"}, Host: ":4500", }, - Genesis: yamlmap.Map{"chain_id": "earth-1"}, + Genesis: xyaml.Map{"chain_id": "earth-1"}, }, Validators: []v1.Validator{ { Name: "alice", Bonded: "100000000stake", - Client: yamlmap.Map{"keyring-backend": keyring.BackendTest}, - App: yamlmap.Map{ - "api": yamlmap.Map{"address": ":1317"}, - "grpc": yamlmap.Map{"address": ":9090"}, - "grpc-web": yamlmap.Map{"address": ":9091"}, + Client: xyaml.Map{"keyring-backend": keyring.BackendTest}, + App: xyaml.Map{ + "api": xyaml.Map{"address": ":1317"}, + "grpc": xyaml.Map{"address": ":9090"}, + "grpc-web": xyaml.Map{"address": ":9091"}, }, - Config: yamlmap.Map{ - "p2p": yamlmap.Map{"laddr": ":26656"}, - "rpc": yamlmap.Map{"laddr": ":26656", "pprof_laddr": ":6060"}, + Config: xyaml.Map{ + "p2p": xyaml.Map{"laddr": ":26656"}, + "rpc": xyaml.Map{"laddr": ":26656", "pprof_laddr": ":6060"}, }, Home: "$HOME/.earth", }, @@ -260,11 +260,11 @@ func runChain( cfg.Validators[0].Home = homePath cfg.Faucet.Host = genAddr(ports[0]) - cfg.Validators[0].App["api"] = yamlmap.Map{"address": genAddr(ports[1])} - cfg.Validators[0].App["grpc"] = yamlmap.Map{"address": genAddr(ports[2])} - cfg.Validators[0].App["grpc-web"] = yamlmap.Map{"address": genAddr(ports[3])} - cfg.Validators[0].Config["p2p"] = yamlmap.Map{"laddr": genAddr(ports[4])} - cfg.Validators[0].Config["rpc"] = yamlmap.Map{ + cfg.Validators[0].App["api"] = xyaml.Map{"address": genAddr(ports[1])} + cfg.Validators[0].App["grpc"] = xyaml.Map{"address": genAddr(ports[2])} + cfg.Validators[0].App["grpc-web"] = xyaml.Map{"address": genAddr(ports[3])} + cfg.Validators[0].Config["p2p"] = xyaml.Map{"laddr": genAddr(ports[4])} + cfg.Validators[0].Config["rpc"] = xyaml.Map{ "laddr": genAddr(ports[5]), "pprof_laddr": genAddr(ports[6]), } diff --git a/integration/node/cmd_query_bank_test.go b/integration/node/cmd_query_bank_test.go index af4ddfbeb7..b1ef6e245c 100644 --- a/integration/node/cmd_query_bank_test.go +++ b/integration/node/cmd_query_bank_test.go @@ -20,7 +20,7 @@ import ( "github.com/ignite/cli/v28/ignite/pkg/cosmosclient" "github.com/ignite/cli/v28/ignite/pkg/randstr" "github.com/ignite/cli/v28/ignite/pkg/xurl" - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" envtest "github.com/ignite/cli/v28/integration" ) diff --git a/integration/node/cmd_tx_bank_send_test.go b/integration/node/cmd_tx_bank_send_test.go index 442c8e9ec7..a99c74fe00 100644 --- a/integration/node/cmd_tx_bank_send_test.go +++ b/integration/node/cmd_tx_bank_send_test.go @@ -18,7 +18,7 @@ import ( "github.com/ignite/cli/v28/ignite/pkg/cosmosclient" "github.com/ignite/cli/v28/ignite/pkg/randstr" "github.com/ignite/cli/v28/ignite/pkg/xurl" - xyaml "github.com/ignite/cli/v28/ignite/pkg/yaml" + "github.com/ignite/cli/v28/ignite/pkg/xyaml" envtest "github.com/ignite/cli/v28/integration" )