Simplifying usage of GetInflation(...) (return value)

fetchai · Sep 5, 2023 · 64f2fd0 · 64f2fd0
1 parent fd3ebbd
commit 64f2fd0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/x/mint/abci.go b/x/mint/abci.go
@@ -23,9 +23,9 @@ func HandleMunicipalInflation(minter *types.Minter, params *types.Params, ctx *s
 		// gather supply value & calculate number of new tokens created from relevant inflation
 		totalDenomSupply := k.BankKeeper.GetSupply(*ctx, pair.Denom)
 
-		cacheItem, exists := cache.GMunicipalInflationCache.GetInflation(pair.Denom)
+		cacheItem := cache.GMunicipalInflationCache.GetInflation(pair.Denom)
 
-		if !exists {
+		if cacheItem == nil {
 			panic(fmt.Errorf("numicipal inflation: missing cache item for the \"%s\" denomination", pair.Denom))
 		}
 

diff --git a/x/mint/cache/municipal_inflation_cahe.go b/x/mint/cache/municipal_inflation_cahe.go
@@ -57,14 +57,19 @@ func (cache *MunicipalInflationCache) RefreshIfNecessary(inflations *[]*types.Mu
 	}
 }
 
-func (cache *MunicipalInflationCache) GetInflation(denom string) (*MunicipalInflationCacheItem, bool) {
+func (cache *MunicipalInflationCache) GetInflation(denom string) *MunicipalInflationCacheItem {
 	val := cache.internal.Load()
 	if val == nil {
-		return nil, false
+		return nil
 	}
 
 	infl, exists := val.(*MunicipalInflationCacheInternal).inflations[denom]
-	return infl, exists
+
+	if exists && infl != nil {
+		return infl
+	}
+
+	return nil
 }
 
 func (cache *MunicipalInflationCache) GetOriginal() *[]*types.MunicipalInflationPair {

diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go
@@ -35,8 +35,8 @@ func (k Keeper) MunicipalInflation(c context.Context, req *types.QueryMunicipalI
 		return &types.QueryMunicipalInflationResponse{Inflations: *cache.GMunicipalInflationCache.GetOriginal()}, nil
 	}
 
-	infl, exists := cache.GMunicipalInflationCache.GetInflation(denom)
-	if !exists {
+	infl := cache.GMunicipalInflationCache.GetInflation(denom)
+	if infl == nil {
 		return nil, fmt.Errorf("there is no municipal inflation defined for requested \"%s\" denomination", denom)
 	}