From 2dec0416a3aec29c98391de45228a4b48668768c Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Fri, 13 Oct 2023 16:21:39 +0200
Subject: [PATCH] Revert "fix(x/authz): GetAuthorizations (backport #17334)
 (#17527)"

This reverts commit 22c28366466e64ebf0df1ce5bec8b1130523552c.
---
 CHANGELOG.md                  |  6 +-----
 x/authz/keeper/keeper.go      |  2 +-
 x/authz/keeper/keeper_test.go | 21 ---------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 882d02bb8d7b..8f0d56d069bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,10 +37,6 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
-### 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`.
-
 ## [v0.46.15](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.14) - 2023-08-21
 
 ### Improvements
@@ -50,7 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/genutil) [#17296](https://github.com/cosmos/cosmos-sdk/pull/17296) Add `MigrateHandler` to allow reuse migrate genesis related function.
     * In v0.46, v0.47 this function is additive to the `genesis migrate` command. However in v0.50+, adding custom migrations to the `genesis migrate` command is directly possible.
 
-### Bug Fixes
+## Bug Fixes
 
 * (server) [#17181](https://github.com/cosmos/cosmos-sdk/pull/17181) Fix `db_backend` lookup fallback from `config.toml`.
 
diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go
index 0b0bf29ef8ee..c1291c95708f 100644
--- a/x/authz/keeper/keeper.go
+++ b/x/authz/keeper/keeper.go
@@ -233,9 +233,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 f10119361afe..fdf8d5d08135 100644
--- a/x/authz/keeper/keeper_test.go
+++ b/x/authz/keeper/keeper_test.go
@@ -445,27 +445,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.app.AuthzKeeper.SaveGrant(s.ctx, addr1, addr2, genAuthMulti, &expired), "creating multi send grant 1->2")
-	s.Require().NoError(s.app.AuthzKeeper.SaveGrant(s.ctx, addr1, addr2, genAuthSend, &expired), "creating send grant 1->2")
-
-	authzs, err := s.app.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))
 }