refactor: fix expected keepers for distribution after collections mig…

…ration
cosmos · Aug 2, 2023 · 0bd961b · 0bd961b
1 parent 5b1bdf1
commit 0bd961b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/x/distribution/README.md b/x/distribution/README.md
@@ -352,13 +352,20 @@ The transaction fails if the amount cannot be transferred from the sender to the
 
 ```go
 func (k Keeper) FundCommunityPool(ctx context.Context, amount sdk.Coins, sender sdk.AccAddress) error {
-    if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, amount); err != nil {
-        return err
-    }
+  if err := k.bankKeeper.SendCoinsFromAccountToModule(ctx, sender, types.ModuleName, amount); err != nil {
+    return err
+  }
+
+	feePool, err := k.FeePool.Get(ctx)
+	if err != nil {
+		return err
+	}
 
-	feePool := k.GetFeePool(ctx)
 	feePool.CommunityPool = feePool.CommunityPool.Add(sdk.NewDecCoinsFromCoins(amount...)...)
-	k.SetFeePool(ctx, feePool)
+	
+  if err := k.FeePool.Set(ctx, feePool); err != nil {
+    return err
+  }
 
 	return nil
 }

diff --git a/x/gov/testutil/expected_keepers_mocks.go b/x/gov/testutil/expected_keepers_mocks.go
diff --git a/x/staking/testutil/expected_keepers_mocks.go b/x/staking/testutil/expected_keepers_mocks.go
diff --git a/x/staking/types/expected_keepers.go b/x/staking/types/expected_keepers.go
@@ -11,7 +11,6 @@ import (
 
 // DistributionKeeper expected distribution keeper (noalias)
 type DistributionKeeper interface {
-	GetFeePoolCommunityCoins(ctx context.Context) sdk.DecCoins
 	GetValidatorOutstandingRewardsCoins(ctx context.Context, val sdk.ValAddress) sdk.DecCoins
 }