Skip to content

Commit

Permalink
Merge branch 'main' into feat/auto-migdoc
Browse files Browse the repository at this point in the history
  • Loading branch information
Pantani authored Mar 11, 2024
2 parents 31971fd + d1b8943 commit 9624d19
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 34 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,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

Expand Down
2 changes: 1 addition & 1 deletion ignite/config/chain/base/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion ignite/config/chain/v1/validator.go
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ignite/config/chain/v1/validator_servers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ignite/pkg/yaml/map.go → ignite/pkg/xyaml/map.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ignite/pkg/yaml/map_test.go → ignite/pkg/xyaml/map_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package yaml_test
package xyaml_test

import (
"testing"

"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) {
Expand Down
2 changes: 1 addition & 1 deletion ignite/pkg/yaml/yaml.go → ignite/pkg/xyaml/yaml.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yaml
package xyaml

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package yaml
package xyaml

import (
"context"
Expand Down
48 changes: 24 additions & 24 deletions integration/ibc/cmd_relayer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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]),
}
Expand Down
2 changes: 1 addition & 1 deletion integration/node/cmd_query_bank_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion integration/node/cmd_tx_bank_send_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down

0 comments on commit 9624d19

Please sign in to comment.