From 72e88c90876226b17e9b11bbe5b9c2371976432e Mon Sep 17 00:00:00 2001 From: Alex | Interchain Labs Date: Tue, 29 Apr 2025 09:17:22 -0400 Subject: [PATCH] chore: deprecate group module (#24571) --- CHANGELOG.md | 4 ++++ simapp/app.go | 6 +++--- simapp/app_config.go | 4 ++-- simapp/app_di.go | 2 +- simapp/app_test.go | 4 ++-- tests/e2e/group/suite.go | 4 ++-- tests/integration/rapidgen/rapidgen.go | 2 +- tests/integration/tx/aminojson/aminojson_test.go | 2 +- tests/integration/tx/decode_test.go | 2 +- x/README.md | 2 +- x/group/README.md | 2 ++ x/group/client/cli/tx.go | 3 ++- x/group/client/cli/tx_test.go | 6 +++--- x/group/client/cli/util.go | 2 +- x/group/keeper/genesis.go | 2 +- x/group/keeper/genesis_test.go | 6 +++--- x/group/keeper/grpc_query.go | 2 +- x/group/keeper/grpc_query_test.go | 6 +++--- x/group/keeper/keeper.go | 3 ++- x/group/keeper/keeper_test.go | 6 +++--- x/group/keeper/msg_server.go | 2 +- x/group/keeper/msg_server_priv_test.go | 2 +- x/group/keeper/msg_server_test.go | 2 +- x/group/keeper/proposal_executor.go | 2 +- x/group/keeper/tally.go | 2 +- x/group/keeper/tally_test.go | 2 +- x/group/migrations/v2/migrate.go | 1 + x/group/module/abci.go | 2 +- x/group/module/abci_test.go | 4 ++-- x/group/module/module.go | 9 +++++---- x/group/proposal_test.go | 2 +- x/group/simulation/decoder.go | 4 ++-- x/group/simulation/decoder_test.go | 8 ++++---- x/group/simulation/genesis.go | 2 +- x/group/simulation/genesis_test.go | 6 +++--- x/group/simulation/msg_factory.go | 4 ++-- x/group/simulation/operations.go | 5 +++-- x/group/simulation/operations_test.go | 6 +++--- x/group/testutil/app_config.go | 2 +- x/group/testutil/expected_keepers.go | 2 +- x/group/types.go | 1 + 41 files changed, 76 insertions(+), 64 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 423646296b..c30c7a2375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Deprecated + +* (x/group) [#24571](https://github.com/cosmos/cosmos-sdk/pull/24571) Deprecate the `x/group` module in the Cosmos SDK repository. This module will not be maintained to the extent that our core modules will and will be kept in a [legacy repo](https://github.com/cosmos/cosmos-legacy). + ### Features * (simsx) [#24062](https://github.com/cosmos/cosmos-sdk/pull/24062) [#24145](https://github.com/cosmos/cosmos-sdk/pull/24145) Add new simsx framework on top of simulations for better module dev experience. diff --git a/simapp/app.go b/simapp/app.go index 620e73b9fc..c9b3bf9c34 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -91,9 +91,9 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/cosmos/cosmos-sdk/x/group" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/mint" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" diff --git a/simapp/app_config.go b/simapp/app_config.go index f072296c31..83a61547cc 100644 --- a/simapp/app_config.go +++ b/simapp/app_config.go @@ -61,8 +61,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/group" - _ "github.com/cosmos/cosmos-sdk/x/group/module" // import for side-effects + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + _ "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed // import for side-effects _ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" _ "github.com/cosmos/cosmos-sdk/x/protocolpool" // import for side-effects diff --git a/simapp/app_di.go b/simapp/app_di.go index a70a43ff2c..e4223cf7eb 100644 --- a/simapp/app_di.go +++ b/simapp/app_di.go @@ -39,7 +39,7 @@ import ( distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" epochskeeper "github.com/cosmos/cosmos-sdk/x/epochs/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" + groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" protocolpoolkeeper "github.com/cosmos/cosmos-sdk/x/protocolpool/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" diff --git a/simapp/app_test.go b/simapp/app_test.go index d06b7df3a3..a17f8bb7c1 100644 --- a/simapp/app_test.go +++ b/simapp/app_test.go @@ -47,8 +47,8 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/cosmos/cosmos-sdk/x/gov" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - grouptypes "github.com/cosmos/cosmos-sdk/x/group" - group "github.com/cosmos/cosmos-sdk/x/group/module" + grouptypes "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + group "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/mint" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/protocolpool" diff --git a/tests/e2e/group/suite.go b/tests/e2e/group/suite.go index 6d1525e543..a16fddc668 100644 --- a/tests/e2e/group/suite.go +++ b/tests/e2e/group/suite.go @@ -20,8 +20,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" - client "github.com/cosmos/cosmos-sdk/x/group/client/cli" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + client "github.com/cosmos/cosmos-sdk/x/group/client/cli" //nolint:staticcheck // deprecated and to be removed ) type E2ETestSuite struct { diff --git a/tests/integration/rapidgen/rapidgen.go b/tests/integration/rapidgen/rapidgen.go index 102ebda9ab..f0c22d371b 100644 --- a/tests/integration/rapidgen/rapidgen.go +++ b/tests/integration/rapidgen/rapidgen.go @@ -43,7 +43,7 @@ import ( disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types" gov_v1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1" gov_v1beta1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - grouptypes "github.com/cosmos/cosmos-sdk/x/group" + grouptypes "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" diff --git a/tests/integration/tx/aminojson/aminojson_test.go b/tests/integration/tx/aminojson/aminojson_test.go index 42e2dbffd7..beab597c09 100644 --- a/tests/integration/tx/aminojson/aminojson_test.go +++ b/tests/integration/tx/aminojson/aminojson_test.go @@ -68,7 +68,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov" gov_v1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1" gov_v1beta1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" + groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/mint" "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/slashing" diff --git a/tests/integration/tx/decode_test.go b/tests/integration/tx/decode_test.go index f22123e797..c9c565b4f7 100644 --- a/tests/integration/tx/decode_test.go +++ b/tests/integration/tx/decode_test.go @@ -33,7 +33,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/consensus" "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/gov" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" + groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/mint" "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/slashing" diff --git a/x/README.md b/x/README.md index 979a544f34..0f6c3852ed 100644 --- a/x/README.md +++ b/x/README.md @@ -34,7 +34,6 @@ capabilities of your blockchain or further specialize it. * [Authz](./authz/README.md) - Authorization for accounts to perform actions on behalf of other accounts. * [Epochs](./epochs/README.md) - Registration so SDK modules can have logic to be executed at the timed tickers. * [Feegrant](./feegrant/README.md) - Grant fee allowances for executing transactions. -* [Group](./group/README.md) - Allows for the creation and management of on-chain multisig accounts. * [NFT](./nft/README.md) - NFT module implemented based on [ADR43](https://docs.cosmos.network/main/architecture/adr-043-nft-module.html). * [ProtocolPool](./protocolpool/README.md) - Extended management of community pool functionality. @@ -45,6 +44,7 @@ in an upcoming release of the Cosmos SDK per our [release process](https://githu * [Crisis](./crisis/README.md) - *Deprecated* halting the blockchain under certain circumstances (e.g. if an invariant is broken). * [Params](./params/README.md) - *Deprecated* Globally available parameter store. +* [Group](./group/README.md) - *Deprecated* Allows for the creation and management of on-chain multisig accounts. This module will be moved to the `cosmos-sdk-legacy` repo for legacy use. To learn more about the process of building modules, visit the [building modules reference documentation](https://docs.cosmos.network/main/building-modules/intro). diff --git a/x/group/README.md b/x/group/README.md index 8327e7ef61..ace764f339 100644 --- a/x/group/README.md +++ b/x/group/README.md @@ -4,6 +4,8 @@ sidebar_position: 1 # `x/group` +⚠️ **DEPRECATED**: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. + ## Abstract The following documents specify the group module. diff --git a/x/group/client/cli/tx.go b/x/group/client/cli/tx.go index ed0af47bfd..ac89bd93d5 100644 --- a/x/group/client/cli/tx.go +++ b/x/group/client/cli/tx.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package cli import ( @@ -14,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/internal/math" ) diff --git a/x/group/client/cli/tx_test.go b/x/group/client/cli/tx_test.go index 377c1c6d35..3a08bcdfe8 100644 --- a/x/group/client/cli/tx_test.go +++ b/x/group/client/cli/tx_test.go @@ -25,9 +25,9 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" testutilmod "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/cosmos/cosmos-sdk/x/group" - groupcli "github.com/cosmos/cosmos-sdk/x/group/client/cli" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + groupcli "github.com/cosmos/cosmos-sdk/x/group/client/cli" //nolint:staticcheck // deprecated and to be removed + groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed ) var validMetadata = "metadata" diff --git a/x/group/client/cli/util.go b/x/group/client/cli/util.go index 2d91167adb..f0eb1a4bff 100644 --- a/x/group/client/cli/util.go +++ b/x/group/client/cli/util.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed ) // parseDecisionPolicy reads and parses the decision policy. diff --git a/x/group/keeper/genesis.go b/x/group/keeper/genesis.go index 457fd461f7..2ac6081420 100644 --- a/x/group/keeper/genesis.go +++ b/x/group/keeper/genesis.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed ) // InitGenesis initializes the group module's genesis state. diff --git a/x/group/keeper/genesis_test.go b/x/group/keeper/genesis_test.go index 6e4f456c93..765725ef72 100644 --- a/x/group/keeper/genesis_test.go +++ b/x/group/keeper/genesis_test.go @@ -21,9 +21,9 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" ) diff --git a/x/group/keeper/grpc_query.go b/x/group/keeper/grpc_query.go index 2c036bdedf..8c82582d08 100644 --- a/x/group/keeper/grpc_query.go +++ b/x/group/keeper/grpc_query.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/errors" "github.com/cosmos/cosmos-sdk/x/group/internal/orm" ) diff --git a/x/group/keeper/grpc_query_test.go b/x/group/keeper/grpc_query_test.go index 3f9c6c817a..ba66eea932 100644 --- a/x/group/keeper/grpc_query_test.go +++ b/x/group/keeper/grpc_query_test.go @@ -20,9 +20,9 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/types/query" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cosmos/cosmos-sdk/x/group" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" ) diff --git a/x/group/keeper/keeper.go b/x/group/keeper/keeper.go index a4621ed087..ace39d9208 100644 --- a/x/group/keeper/keeper.go +++ b/x/group/keeper/keeper.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package keeper import ( @@ -12,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/errors" "github.com/cosmos/cosmos-sdk/x/group/internal/orm" ) diff --git a/x/group/keeper/keeper_test.go b/x/group/keeper/keeper_test.go index c7d42bc00f..c24229987b 100644 --- a/x/group/keeper/keeper_test.go +++ b/x/group/keeper/keeper_test.go @@ -22,9 +22,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/bank" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" ) diff --git a/x/group/keeper/msg_server.go b/x/group/keeper/msg_server.go index 58869a5b1b..4686182861 100644 --- a/x/group/keeper/msg_server.go +++ b/x/group/keeper/msg_server.go @@ -15,7 +15,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/errors" "github.com/cosmos/cosmos-sdk/x/group/internal/math" "github.com/cosmos/cosmos-sdk/x/group/internal/orm" diff --git a/x/group/keeper/msg_server_priv_test.go b/x/group/keeper/msg_server_priv_test.go index dd5c3e9464..4181744e07 100644 --- a/x/group/keeper/msg_server_priv_test.go +++ b/x/group/keeper/msg_server_priv_test.go @@ -19,7 +19,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/internal/math" ) diff --git a/x/group/keeper/msg_server_test.go b/x/group/keeper/msg_server_test.go index 8717bef0f5..171885d7e5 100644 --- a/x/group/keeper/msg_server_test.go +++ b/x/group/keeper/msg_server_test.go @@ -17,7 +17,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/internal/math" "github.com/cosmos/cosmos-sdk/x/group/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" diff --git a/x/group/keeper/proposal_executor.go b/x/group/keeper/proposal_executor.go index ecbda22ced..6330acc2da 100644 --- a/x/group/keeper/proposal_executor.go +++ b/x/group/keeper/proposal_executor.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/errors" ) diff --git a/x/group/keeper/tally.go b/x/group/keeper/tally.go index c390ea8c0d..b3436096e1 100644 --- a/x/group/keeper/tally.go +++ b/x/group/keeper/tally.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/errors" "github.com/cosmos/cosmos-sdk/x/group/internal/orm" ) diff --git a/x/group/keeper/tally_test.go b/x/group/keeper/tally_test.go index a6b47fc570..d82cc19c57 100644 --- a/x/group/keeper/tally_test.go +++ b/x/group/keeper/tally_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed ) func (s *TestSuite) TestTally() { diff --git a/x/group/migrations/v2/migrate.go b/x/group/migrations/v2/migrate.go index 550ae51802..000fb394c2 100644 --- a/x/group/migrations/v2/migrate.go +++ b/x/group/migrations/v2/migrate.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package v2 import ( diff --git a/x/group/module/abci.go b/x/group/module/abci.go index 4ae25a9e24..dea57963c8 100644 --- a/x/group/module/abci.go +++ b/x/group/module/abci.go @@ -2,7 +2,7 @@ package module import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/group/keeper" + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed ) // EndBlocker called at every block, updates proposal's `FinalTallyResult` and diff --git a/x/group/module/abci_test.go b/x/group/module/abci_test.go index f7305fe54c..52e0ac0674 100644 --- a/x/group/module/abci_test.go +++ b/x/group/module/abci_test.go @@ -21,8 +21,8 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/module" grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" diff --git a/x/group/module/module.go b/x/group/module/module.go index 1c39992fd5..dfc4e81da5 100644 --- a/x/group/module/module.go +++ b/x/group/module/module.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package module import ( @@ -22,10 +23,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/client/cli" - "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/simulation" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/client/cli" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/simulation" //nolint:staticcheck // deprecated and to be removed ) // ConsensusVersion defines the current x/group module consensus version. diff --git a/x/group/proposal_test.go b/x/group/proposal_test.go index b848047880..3955833f4f 100644 --- a/x/group/proposal_test.go +++ b/x/group/proposal_test.go @@ -7,7 +7,7 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/module" + "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed ) // TestGogoUnmarshalProposal tests some weird behavior in gogoproto diff --git a/x/group/simulation/decoder.go b/x/group/simulation/decoder.go index aea2e9e1d7..660b9f9cad 100644 --- a/x/group/simulation/decoder.go +++ b/x/group/simulation/decoder.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/group/simulation/decoder_test.go b/x/group/simulation/decoder_test.go index 298fef4d8c..596dbf037e 100644 --- a/x/group/simulation/decoder_test.go +++ b/x/group/simulation/decoder_test.go @@ -9,11 +9,11 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" "github.com/cosmos/cosmos-sdk/types/kv" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/group/internal/orm" - "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/module" - "github.com/cosmos/cosmos-sdk/x/group/simulation" + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/simulation" //nolint:staticcheck // deprecated and to be removed ) func TestDecodeStore(t *testing.T) { diff --git a/x/group/simulation/genesis.go b/x/group/simulation/genesis.go index f390bb447f..1f3ae16cae 100644 --- a/x/group/simulation/genesis.go +++ b/x/group/simulation/genesis.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed ) const ( diff --git a/x/group/simulation/genesis_test.go b/x/group/simulation/genesis_test.go index 1ca2be16fb..c0ff8e7ecc 100644 --- a/x/group/simulation/genesis_test.go +++ b/x/group/simulation/genesis_test.go @@ -13,9 +13,9 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/cosmos-sdk/x/group" - groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" - "github.com/cosmos/cosmos-sdk/x/group/simulation" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/simulation" //nolint:staticcheck // deprecated and to be removed ) func TestRandomizedGenState(t *testing.T) { diff --git a/x/group/simulation/msg_factory.go b/x/group/simulation/msg_factory.go index 1e15faf84e..9c74aeb134 100644 --- a/x/group/simulation/msg_factory.go +++ b/x/group/simulation/msg_factory.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/simsx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed ) func MsgCreateGroupFactory() simsx.SimMsgFactoryFn[*group.MsgCreateGroup] { diff --git a/x/group/simulation/operations.go b/x/group/simulation/operations.go index d91c7febd2..90fd98ab46 100644 --- a/x/group/simulation/operations.go +++ b/x/group/simulation/operations.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package simulation import ( @@ -14,8 +15,8 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/cosmos/cosmos-sdk/x/group" - "github.com/cosmos/cosmos-sdk/x/group/keeper" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed "github.com/cosmos/cosmos-sdk/x/simulation" ) diff --git a/x/group/simulation/operations_test.go b/x/group/simulation/operations_test.go index dbd43b490f..96c28d6afe 100644 --- a/x/group/simulation/operations_test.go +++ b/x/group/simulation/operations_test.go @@ -23,9 +23,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" - groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" - "github.com/cosmos/cosmos-sdk/x/group/simulation" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed + groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" //nolint:staticcheck // deprecated and to be removed + "github.com/cosmos/cosmos-sdk/x/group/simulation" //nolint:staticcheck // deprecated and to be removed grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" ) diff --git a/x/group/testutil/app_config.go b/x/group/testutil/app_config.go index a9dc1f950c..1d948305ea 100644 --- a/x/group/testutil/app_config.go +++ b/x/group/testutil/app_config.go @@ -8,7 +8,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/bank" // import as blank for app wiring _ "github.com/cosmos/cosmos-sdk/x/consensus" // import as blank for app wiring _ "github.com/cosmos/cosmos-sdk/x/genutil" // import as blank for app wiring - _ "github.com/cosmos/cosmos-sdk/x/group/module" // import as blank for app wiring + _ "github.com/cosmos/cosmos-sdk/x/group/module" //nolint:staticcheck // deprecated and to be removed // import as blank for app wiring _ "github.com/cosmos/cosmos-sdk/x/mint" // import as blank for app wiring _ "github.com/cosmos/cosmos-sdk/x/params" // import as blank for app wiring _ "github.com/cosmos/cosmos-sdk/x/staking" // import as blank for app wiring diff --git a/x/group/testutil/expected_keepers.go b/x/group/testutil/expected_keepers.go index fd4697438f..d5258645af 100644 --- a/x/group/testutil/expected_keepers.go +++ b/x/group/testutil/expected_keepers.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bank "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/group" + "github.com/cosmos/cosmos-sdk/x/group" //nolint:staticcheck // deprecated and to be removed ) // AccountKeeper extends `AccountKeeper` from expected_keepers. diff --git a/x/group/types.go b/x/group/types.go index cab7cfc021..49cbaa5d58 100644 --- a/x/group/types.go +++ b/x/group/types.go @@ -1,3 +1,4 @@ +// Deprecated: This package is deprecated and will be removed in the next major release. The `x/group` module will be moved to a separate repo `github.com/cosmos/cosmos-sdk-legacy`. package group import (