composable to layer

ComposableFi · Oct 13, 2023 · f7b6cac · f7b6cac
1 parent b4268cc
commit f7b6cac
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/cmd/composabled/cmd/bech32_convert.go → cmd/layerd/cmd/bech32_convert.go b/cmd/composabled/cmd/bech32_convert.go → cmd/layerd/cmd/bech32_convert.go
@@ -16,9 +16,9 @@ func AddBech32ConvertCommand() *cobra.Command {
 		Long: `Convert any bech32 string to the composable prefix
 
 Example:
-	composabled debug bech32-convert akash1a6zlyvpnksx8wr6wz8wemur2xe8zyh0ytz6d88
+	layerd debug bech32-convert akash1a6zlyvpnksx8wr6wz8wemur2xe8zyh0ytz6d88
 
-	composabled debug bech32-convert stride1673f0t8p893rqyqe420mgwwz92ac4qv6synvx2 --prefix osmo
+	layerd debug bech32-convert stride1673f0t8p893rqyqe420mgwwz92ac4qv6synvx2 --prefix osmo
 	`,
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/cmd/composabled/cmd/genaccounts.go → cmd/layerd/cmd/genaccounts.go b/cmd/composabled/cmd/genaccounts.go → cmd/layerd/cmd/genaccounts.go
@@ -201,7 +201,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 func CovertPrefixAddr() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "convert [address]",
-		Short: "Convert prefix from centauri to composable",
+		Short: "Convert prefix from centauri to layer",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			newAddr := utils.ConvertAccAddr(args[0])

diff --git a/cmd/composabled/cmd/root.go → cmd/layerd/cmd/root.go b/cmd/composabled/cmd/root.go → cmd/layerd/cmd/root.go
diff --git a/cmd/composabled/config/config.go → cmd/layerd/config/config.go b/cmd/composabled/config/config.go → cmd/layerd/config/config.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	// Bech32Prefix defines the Bech32 prefix used for EthAccounts
-	Bech32Prefix = "composable"
+	Bech32Prefix = "layer"
 
 	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
 	Bech32PrefixAccAddr = Bech32Prefix
@@ -40,8 +40,8 @@ func SetupConfig() {
 	SetAddressPrefixes(config)
 	config.Seal()
 
-	version.AppName = "composable"
-	version.Name = "composabled"
+	version.AppName = "layer"
+	version.Name = "layerd"
 }
 
 // SetBech32Prefixes sets the global prefixes to be used when serializing addresses and public keys to Bech32 strings.

diff --git a/cmd/composabled/main.go → cmd/layerd/main.go b/cmd/composabled/main.go → cmd/layerd/main.go
diff --git a/tests/interchaintest/ibc_transfer_test.go b/tests/interchaintest/ibc_transfer_test.go
@@ -97,8 +97,8 @@ func TestCentauriPicassoIBCTransfer(t *testing.T) {
 				Name:           "centauri",
 				ChainID:        "centaurid",
 				Images:         []ibc.DockerImage{CentauriImage},
-				Bin:            "centaurid",
-				Bech32Prefix:   "centauri",
+				Bin:            "layerd",
+				Bech32Prefix:   "layer",
 				Denom:          "stake",
 				GasPrices:      "0.00stake",
 				GasAdjustment:  1.3,

diff --git a/tests/interchaintest/push_wasm_client_code_test.go b/tests/interchaintest/push_wasm_client_code_test.go
@@ -69,8 +69,8 @@ func TestPushWasmClientCode(t *testing.T) {
 				Name:           "composable",
 				ChainID:        "centaurid",
 				Images:         []ibc.DockerImage{CentauriImage},
-				Bin:            "composabled",
-				Bech32Prefix:   "composable",
+				Bin:            "layerd",
+				Bech32Prefix:   "layer",
 				Denom:          "stake",
 				GasPrices:      "0.00stake",
 				GasAdjustment:  1.3,

diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go
@@ -24,8 +24,8 @@ var (
 		Name:                "composable",
 		ChainID:             "composable-2",
 		Images:              []ibc.DockerImage{CentauriImage},
-		Bin:                 "composabled",
-		Bech32Prefix:        "composable",
+		Bin:                 "layerd",
+		Bech32Prefix:        "layer",
 		Denom:               "stake",
 		CoinType:            "118",
 		GasPrices:           "0.0stake",
@@ -45,7 +45,7 @@ func GetDockerImageInfo() (repo, version string) {
 	repo = CentauriICTestRepo
 	if !found {
 		// make local-image
-		repo = "composable"
+		repo = "layer"
 		branchVersion = "debug"
 	}
 

diff --git a/tests/interchaintest/upgrade_chain_test.go b/tests/interchaintest/upgrade_chain_test.go
@@ -20,7 +20,7 @@ const (
 
 func TestComposableUpgrade(t *testing.T) {
 	repo, version := GetDockerImageInfo()
-	CosmosChainUpgradeTest(t, repo, version, "composable")
+	CosmosChainUpgradeTest(t, repo, version, "v6")
 }
 
 func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion, upgradeName string) {
@@ -43,8 +43,8 @@ func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion,
 						UidGid:     "1025:1025",
 					},
 				},
-				Bin:            "centaurid",
-				Bech32Prefix:   "centauri",
+				Bin:            "layerd",
+				Bech32Prefix:   "layer",
 				Denom:          "ppica",
 				GasPrices:      "0.00ppica",
 				GasAdjustment:  1.3,