Revert "Save gas on IsFeeEnabled (backport #2786) (#2814)" (#3660)

colin-axner · crodriguezvega · web-flow · commit 1df216fd0d2b · 2023-05-25T22:23:55.000+02:00
* Revert "Save gas on IsFeeEnabled (backport #2786) (#2814)" This reverts commit dd2c03e. * remove additional change in changelog entry * update CHANGELOG * Update CHANGELOG.md --------- Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## [[Unreleased]]
+
+### Bug Fixes
+
+* [\#3660](https://github.com/cosmos/ibc-go/pull/3660) Revert state-machine breaking improvement from PR [#2786](https://github.com/cosmos/ibc-go/pull/2786).
+
 ## [v4.1.2](https://github.com/cosmos/ibc-go/releases/tag/v4.1.2) - 2023-05-25
 
 ### Dependencies
diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go
@@ -121,7 +121,7 @@ func (k Keeper) DeleteFeeEnabled(ctx sdk.Context, portID, channelID string) {
 // fee enabled flag for the given port and channel identifiers
 func (k Keeper) IsFeeEnabled(ctx sdk.Context, portID, channelID string) bool {
 	store := ctx.KVStore(k.storeKey)
-	return store.Has(types.KeyFeeEnabled(portID, channelID))
+	return store.Get(types.KeyFeeEnabled(portID, channelID)) != nil
 }
 
 // GetAllFeeEnabledChannels returns a list of all ics29 enabled channels containing portID & channelID that are stored in state

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (k Keeper) DeleteFeeEnabled(ctx sdk.Context, portID, channelID string) {`
`121`	`121`	`// fee enabled flag for the given port and channel identifiers`
`122`	`122`	`func (k Keeper) IsFeeEnabled(ctx sdk.Context, portID, channelID string) bool {`
`123`	`123`	`store := ctx.KVStore(k.storeKey)`
`124`		`- return store.Has(types.KeyFeeEnabled(portID, channelID))`
	`124`	`+ return store.Get(types.KeyFeeEnabled(portID, channelID)) != nil`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// GetAllFeeEnabledChannels returns a list of all ics29 enabled channels containing portID & channelID that are stored in state`