use CacheContext() in AssertInvariants()

Finschia · Oct 31, 2023 · ff4cc26 · ff4cc26
1 parent e016340
commit ff4cc26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/x/crisis/keeper/keeper.go b/x/crisis/keeper/keeper.go
@@ -76,7 +76,9 @@ func (k Keeper) AssertInvariants(ctx sdk.Context) {
 	n := len(invarRoutes)
 	for i, ir := range invarRoutes {
 		logger.Info("asserting crisis invariants", "inv", fmt.Sprint(i+1, "/", n), "name", ir.FullRoute())
-		if res, stop := ir.Invar(ctx); stop {
+
+		invCtx, _ := ctx.CacheContext()
+		if res, stop := ir.Invar(invCtx); stop {
 			// TODO: Include app name as part of context to allow for this to be
 			// variable.
 			panic(fmt.Errorf("invariant broken: %s\n"+

diff --git a/x/foundation/keeper/internal/invariants.go b/x/foundation/keeper/internal/invariants.go
@@ -25,9 +25,6 @@ func RegisterInvariants(ir sdk.InvariantRegistry, k Keeper) {
 
 func ModuleAccountInvariant(k Keeper) sdk.Invariant {
 	return func(ctx sdk.Context) (string, bool) {
-		// cache, we don't want to write changes
-		ctx, _ = ctx.CacheContext()
-
 		treasuryAcc := k.authKeeper.GetModuleAccount(ctx, foundation.TreasuryName)
 		balance := k.bankKeeper.GetAllBalances(ctx, treasuryAcc.GetAddress())
 
@@ -41,24 +38,18 @@ func ModuleAccountInvariant(k Keeper) sdk.Invariant {
 
 func TotalWeightInvariant(k Keeper) sdk.Invariant {
 	return func(ctx sdk.Context) (string, bool) {
-		// cache, we don't want to write changes
-		ctx, _ = ctx.CacheContext()
-
 		expected := k.GetFoundationInfo(ctx).TotalWeight
-		real := sdk.NewDec(int64(len(k.GetMembers(ctx))))
+		actual := sdk.NewDec(int64(len(k.GetMembers(ctx))))
 
-		msg := fmt.Sprintf("total weight of foundation; expected %s, got %s\n", expected, real)
-		broken := !real.Equal(expected)
+		msg := fmt.Sprintf("total weight of foundation; expected %s, got %s\n", expected, actual)
+		broken := !actual.Equal(expected)
 
 		return sdk.FormatInvariant(foundation.ModuleName, totalWeightInvariant, msg), broken
 	}
 }
 
 func ProposalInvariant(k Keeper) sdk.Invariant {
 	return func(ctx sdk.Context) (string, bool) {
-		// cache, we don't want to write changes
-		ctx, _ = ctx.CacheContext()
-
 		version := k.GetFoundationInfo(ctx).Version
 		msg := fmt.Sprintf("current foundation version; %d\n", version)
 		broken := false