Merge PR cosmos#5610: proto: migrate x/distr to use hybrid codec

larry0x · Feb 11, 2020 · 918abee · 918abee
1 parent ca483bf
commit 918abee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app.go b/app.go
@@ -179,7 +179,7 @@ func NewSimApp(
 		app.SupplyKeeper, auth.FeeCollectorName,
 	)
 	app.DistrKeeper = distr.NewKeeper(
-		app.cdc, keys[distr.StoreKey], app.subspaces[distr.ModuleName], app.BankKeeper, &stakingKeeper,
+		appCodec.Distribution, keys[distr.StoreKey], app.subspaces[distr.ModuleName], app.BankKeeper, &stakingKeeper,
 		app.SupplyKeeper, auth.FeeCollectorName, app.ModuleAccountAddrs(),
 	)
 	app.SlashingKeeper = slashing.NewKeeper(

diff --git a/codec.go b/codec.go
@@ -4,6 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting"
+	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 )
 
@@ -12,15 +13,17 @@ import (
 type AppCodec struct {
 	amino *codec.Codec
 
-	Staking *staking.Codec
+	Staking      *staking.Codec
+	Distribution *distr.Codec
 }
 
 func NewAppCodec() *AppCodec {
 	amino := MakeCodec()
 
 	return &AppCodec{
-		amino:   amino,
-		Staking: staking.NewCodec(amino),
+		amino:        amino,
+		Staking:      staking.NewCodec(amino),
+		Distribution: distr.NewCodec(amino),
 	}
 }
 

diff --git a/export.go b/export.go
@@ -87,9 +87,8 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []str
 
 	// reinitialize all validators
 	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val exported.ValidatorI) (stop bool) {
-
 		// donate any unwithdrawn outstanding reward fraction tokens to the community pool
-		scraps := app.DistrKeeper.GetValidatorOutstandingRewards(ctx, val.GetOperator())
+		scraps := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator())
 		feePool := app.DistrKeeper.GetFeePool(ctx)
 		feePool.CommunityPool = feePool.CommunityPool.Add(scraps...)
 		app.DistrKeeper.SetFeePool(ctx, feePool)