don't rename appmodule

cosmos · Sep 2, 2024 · 282ab5d · 282ab5d
1 parent 2636680
commit 282ab5d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,7 +54,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 
 ### API Breaking Changes
 
-* [#21497](https://github.com/cosmos/cosmos-sdk/pull/21497) Rename `x/consensus` to `x/comet`. Only the module/package name has changed, endpoints, proto package, and other references remain the same.
+* [#21497](https://github.com/cosmos/cosmos-sdk/pull/21497) Rename `x/consensus` to `x/comet`. Only the go module name has changed, appmodule, endpoints, proto package, and other references remain the same.
 
 ### Deprecated
 

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -443,26 +443,7 @@ if err != nil {
 The `x/consensus` module has been renamed to `x/comet`. More consensus engines are supported in the Cosmos SDK for server/v2.
 The renaming was done to signify that.
 
-For backward compatibility the store key has been kept as `consensus`, a genesis migration have been added as well.
-
-Due to add add the following in your `app_config.go` / `app.yaml` when using `runtime`:
-
-```diff
-OverrideStoreKeys: []*runtimev2.StoreKeyConfig{
-	{
-		ModuleName: authtypes.ModuleName,
-		KvStoreKey: "acc",
-	},
-	{
-		ModuleName: accounts.ModuleName,
-		KvStoreKey: accounts.StoreKey,
-	},
-+	{
-+		ModuleName: comettypes.ModuleName,
-+		KvStoreKey: comettypes.StoreKey,
-+	},
-},
-```
+For backward compatibility the module name and its store key has been kept as `consensus`.
 
 ### `x/crsis`
 

diff --git a/simapp/app_config.go b/simapp/app_config.go
@@ -144,10 +144,6 @@ var (
 							ModuleName: accounts.ModuleName,
 							KvStoreKey: accounts.StoreKey,
 						},
-						{
-							ModuleName: comettypes.ModuleName,
-							KvStoreKey: comettypes.StoreKey,
-						},
 					},
 					// NOTE: The genutils module must occur after staking so that pools are
 					// properly initialized with tokens from genesis accounts.

diff --git a/simapp/v2/app_config.go b/simapp/v2/app_config.go
@@ -142,10 +142,6 @@ var (
 							ModuleName: accounts.ModuleName,
 							KvStoreKey: accounts.StoreKey,
 						},
-						{
-							ModuleName: comettypes.ModuleName,
-							KvStoreKey: comettypes.StoreKey,
-						},
 					},
 					// NOTE: The genutils module must occur after staking so that pools are
 					// properly initialized with tokens from genesis accounts.

diff --git a/x/comet/types/keys.go b/x/comet/types/keys.go
@@ -2,8 +2,8 @@ package types
 
 const (
 	// ModuleName defines the name of the x/comet module.
-	ModuleName = "comet"
+	ModuleName = "consensus" // The module name is still `consensus` here to keep the same module address.
 
 	// StoreKey defines the module's store key.
-	StoreKey = "consensus"
+	StoreKey = ModuleName
 )