From 243e87660b87f2e11162e1c2cc2f10a1a373da36 Mon Sep 17 00:00:00 2001 From: colin axner Date: Wed, 24 Jul 2019 15:54:46 -0700 Subject: [PATCH] Merge PR #4779: Update staking/supply to use exported account interface --- x/staking/types/expected_keepers.go | 4 ++-- x/supply/genesis.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x/staking/types/expected_keepers.go b/x/staking/types/expected_keepers.go index 23da1ac5b5..8e8485791f 100644 --- a/x/staking/types/expected_keepers.go +++ b/x/staking/types/expected_keepers.go @@ -2,7 +2,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/cosmos/cosmos-sdk/x/auth/exported" stakingexported "github.com/cosmos/cosmos-sdk/x/staking/exported" "github.com/cosmos/cosmos-sdk/x/supply" supplyexported "github.com/cosmos/cosmos-sdk/x/supply/exported" @@ -16,7 +16,7 @@ type DistributionKeeper interface { // AccountKeeper defines the expected account keeper (noalias) type AccountKeeper interface { - IterateAccounts(ctx sdk.Context, process func(auth.Account) (stop bool)) + IterateAccounts(ctx sdk.Context, process func(exported.Account) (stop bool)) } // SupplyKeeper defines the expected supply Keeper (noalias) diff --git a/x/supply/genesis.go b/x/supply/genesis.go index 33c67800cc..8084f8c021 100644 --- a/x/supply/genesis.go +++ b/x/supply/genesis.go @@ -2,7 +2,7 @@ package supply import ( sdk "github.com/cosmos/cosmos-sdk/types" - autypes "github.com/cosmos/cosmos-sdk/x/auth" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/exported" "github.com/cosmos/cosmos-sdk/x/supply/internal/types" ) @@ -14,7 +14,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, ak types.AccountKeeper, data Ge if data.Supply.Total.Empty() { var totalSupply sdk.Coins ak.IterateAccounts(ctx, - func(acc autypes.Account) (stop bool) { + func(acc authtypes.Account) (stop bool) { totalSupply = totalSupply.Add(acc.GetCoins()) return false },