From 9492cf3c2709cab289c9670e71bf2ecc1e7367a7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 20:58:17 +0200
Subject: [PATCH] =?UTF-8?q?fix(x/group):=20rename=20group's=20legacy=20ORM?=
 =?UTF-8?q?=20error=20codespace=20to=20prevent=20co=E2=80=A6=20(backport?=
 =?UTF-8?q?=20#17146)=20(#17148)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md          | 4 ++++
 x/group/errors/orm.go | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6443a1fb6145..d49ea845f8ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/group, x/gov) [#17109](https://github.com/cosmos/cosmos-sdk/pull/17109) Let proposal summary be 40x longer than metadata limit.
 * (version) [#17096](https://github.com/cosmos/cosmos-sdk/pull/17096) Improve `getSDKVersion()` to handle module replacements.
 
+### Bug Fixes
+
+* (x/group) [#17146](https://github.com/cosmos/cosmos-sdk/pull/17146) Rename x/group legacy ORM package's error codespace from "orm" to "legacy_orm", preventing collisions with ORM's error codespace "orm".
+
 ### CLI Breaking Changes
 
 * (rosetta) [#16276](https://github.com/cosmos/cosmos-sdk/issues/16276) Rosetta migration to standalone repo.
diff --git a/x/group/errors/orm.go b/x/group/errors/orm.go
index 370abdb882b8..bfebd0e54deb 100644
--- a/x/group/errors/orm.go
+++ b/x/group/errors/orm.go
@@ -3,7 +3,7 @@ package errors
 import "cosmossdk.io/errors"
 
 // mathCodespace is the codespace for all errors defined in orm package
-const ormCodespace = "orm"
+const ormCodespace = "legacy_orm"
 
 var (
 	// ErrORMIteratorDone defines an error when an iterator is done