From a259605cc8b4466fa86c59fa61faa4c61b07dfeb Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Thu, 31 Aug 2023 13:22:52 +0200 Subject: [PATCH] Revert "fix(x/authz): GetAuthorizations (backport #17334) (#17524)" This reverts commit bdbc1d6196a90dac1d59795145af8977c78ef7b4. --- CHANGELOG.md | 1 - x/authz/keeper/keeper.go | 2 +- x/authz/keeper/keeper_test.go | 21 --------------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e140908aaf1..02203d95b8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,7 +54,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes -* (x/authz) [#17524](https://github.com/cosmos/cosmos-sdk/pull/17524) Fix an issue where the `cachedValue` of an authorization would not be correcty populated when there are multiple authorizations returned in `GetAuthorizations`. * (server) [#17181](https://github.com/cosmos/cosmos-sdk/pull/17181) Fix `db_backend` lookup fallback from `config.toml`. * (runtime) [#17284](https://github.com/cosmos/cosmos-sdk/pull/17284) Properly allow to combine depinject-enabled modules and non-depinject-enabled modules in app v2. * (baseapp) [#17159](https://github.com/cosmos/cosmos-sdk/pull/17159) Validators can propose blocks that exceed the gas limit. diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go index 8e077e7674f..788b87418e2 100644 --- a/x/authz/keeper/keeper.go +++ b/x/authz/keeper/keeper.go @@ -234,9 +234,9 @@ func (k Keeper) GetAuthorizations(ctx sdk.Context, grantee sdk.AccAddress, grant iter := sdk.KVStorePrefixIterator(store, key) defer iter.Close() + var authorization authz.Grant var authorizations []authz.Authorization for ; iter.Valid(); iter.Next() { - var authorization authz.Grant if err := k.cdc.Unmarshal(iter.Value(), &authorization); err != nil { return nil, err } diff --git a/x/authz/keeper/keeper_test.go b/x/authz/keeper/keeper_test.go index 80d8aef1837..c9d3189ca05 100644 --- a/x/authz/keeper/keeper_test.go +++ b/x/authz/keeper/keeper_test.go @@ -470,27 +470,6 @@ func (s *TestSuite) TestGetAuthorization() { } } -func (s *TestSuite) TestGetAuthorizations() { - require := s.Require() - addr1 := s.addrs[1] - addr2 := s.addrs[2] - - genAuthMulti := authz.NewGenericAuthorization(sdk.MsgTypeURL(&banktypes.MsgMultiSend{})) - genAuthSend := authz.NewGenericAuthorization(sdk.MsgTypeURL(&banktypes.MsgSend{})) - - start := s.ctx.BlockHeader().Time - expired := start.Add(time.Duration(1) * time.Second) - - s.Require().NoError(s.authzKeeper.SaveGrant(s.ctx, addr1, addr2, genAuthMulti, &expired), "creating multi send grant 1->2") - s.Require().NoError(s.authzKeeper.SaveGrant(s.ctx, addr1, addr2, genAuthSend, &expired), "creating send grant 1->2") - - authzs, err := s.authzKeeper.GetAuthorizations(s.ctx, addr1, addr2) - require.NoError(err) - require.Len(authzs, 2) - require.Equal(sdk.MsgTypeURL(&banktypes.MsgMultiSend{}), authzs[0].MsgTypeURL()) - require.Equal(sdk.MsgTypeURL(&banktypes.MsgSend{}), authzs[1].MsgTypeURL()) -} - func TestTestSuite(t *testing.T) { suite.Run(t, new(TestSuite)) }