refactor(x/protocol): remove Accounts.String()

x/protocolpool/depinject.go

@@ -53,7 +53,12 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		authority = authtypes.NewModuleAddressOrBech32Address(in.Config.Authority)
 	}
 
-	k := keeper.NewKeeper(in.Codec, in.Environment, in.AccountKeeper, in.BankKeeper, in.StakingKeeper, authority.String())
+	authorityAddr, err := in.AccountKeeper.AddressCodec().BytesToString(authority)
+	if err != nil {
+		panic(err)
+	}
+
+	k := keeper.NewKeeper(in.Codec, in.Environment, in.AccountKeeper, in.BankKeeper, in.StakingKeeper, authorityAddr)
 	m := NewAppModule(in.Codec, k, in.AccountKeeper, in.BankKeeper)
 
 	return ModuleOutputs{

x/protocolpool/keeper/genesis.go

@@ -54,8 +54,12 @@ func (k Keeper) InitGenesis(ctx context.Context, data *types.GenesisState) error
 func (k Keeper) ExportGenesis(ctx context.Context) (*types.GenesisState, error) {
 	var cf []*types.ContinuousFund
 	err := k.ContinuousFund.Walk(ctx, nil, func(key sdk.AccAddress, value types.ContinuousFund) (stop bool, err error) {
+		recipient, err := k.authKeeper.AddressCodec().BytesToString(key)
+		if err != nil {
+			return true, err
+		}
 		cf = append(cf, &types.ContinuousFund{
-			Recipient:  key.String(),
+			Recipient:  recipient,
 			Percentage: value.Percentage,
 			Expiry:     value.Expiry,
 		})
@@ -67,8 +71,12 @@ func (k Keeper) ExportGenesis(ctx context.Context) (*types.GenesisState, error)
 
 	var budget []*types.Budget
 	err = k.BudgetProposal.Walk(ctx, nil, func(key sdk.AccAddress, value types.Budget) (stop bool, err error) {
+		recipient, err := k.authKeeper.AddressCodec().BytesToString(key)
+		if err != nil {
+			return true, err
+		}
 		budget = append(budget, &types.Budget{
-			RecipientAddress: key.String(),
+			RecipientAddress: recipient,
 			TotalBudget:      value.TotalBudget,
 			ClaimedAmount:    value.ClaimedAmount,
 			StartTime:        value.StartTime,

x/protocolpool/keeper/grpc_query_test.go

@@ -6,6 +6,7 @@ import (
 	"cosmossdk.io/math"
 	"cosmossdk.io/x/protocolpool/types"
 
+	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -14,6 +15,8 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 	period := time.Duration(60) * time.Second
 	zeroCoin := sdk.NewCoin("foo", math.ZeroInt())
 	nextClaimFrom := startTime.Add(period)
+	recipientStrAddr, err := codectestutil.CodecOptions{}.GetAddressCodec().BytesToString(recipientAddr)
+	suite.Require().NoError(err)
 	testCases := []struct {
 		name           string
 		preRun         func()
@@ -34,7 +37,7 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 		{
 			name: "no budget proposal found",
 			req: &types.QueryUnclaimedBudgetRequest{
-				Address: recipientAddr.String(),
+				Address: recipientStrAddr,
 			},
 			expErr:    true,
 			expErrMsg: "no budget proposal found for address",
@@ -44,7 +47,7 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 			preRun: func() {
 				// Prepare a valid budget proposal
 				budget := types.Budget{
-					RecipientAddress: recipientAddr.String(),
+					RecipientAddress: recipientStrAddr,
 					TotalBudget:      &fooCoin,
 					StartTime:        &startTime,
 					Tranches:         2,
@@ -54,7 +57,7 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 				suite.Require().NoError(err)
 			},
 			req: &types.QueryUnclaimedBudgetRequest{
-				Address: recipientAddr.String(),
+				Address: recipientStrAddr,
 			},
 			expErr:         false,
 			unclaimedFunds: &fooCoin,
@@ -72,7 +75,7 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 			preRun: func() {
 				// Prepare a valid budget proposal
 				budget := types.Budget{
-					RecipientAddress: recipientAddr.String(),
+					RecipientAddress: recipientStrAddr,
 					TotalBudget:      &fooCoin,
 					StartTime:        &startTime,
 					Tranches:         2,
@@ -83,15 +86,15 @@ func (suite *KeeperTestSuite) TestUnclaimedBudget() {
 
 				// Claim the funds once
 				msg := &types.MsgClaimBudget{
-					RecipientAddress: recipientAddr.String(),
+					RecipientAddress: recipientStrAddr,
 				}
 				suite.mockSendCoinsFromModuleToAccount(recipientAddr)
 				_, err = suite.msgServer.ClaimBudget(suite.ctx, msg)
 				suite.Require().NoError(err)
 			},
 
 			req: &types.QueryUnclaimedBudgetRequest{
-				Address: recipientAddr.String(),
+				Address: recipientStrAddr,
 			},
 			expErr:         false,
 			unclaimedFunds: &fooCoin2,

x/protocolpool/keeper/keeper.go

@@ -113,16 +113,21 @@ func (k Keeper) GetCommunityPool(ctx context.Context) (sdk.Coins, error) {
 	return k.bankKeeper.GetAllBalances(ctx, moduleAccount.GetAddress()), nil
 }
 
-func (k Keeper) withdrawContinuousFund(ctx context.Context, recipient sdk.AccAddress) (sdk.Coin, error) {
+func (k Keeper) withdrawContinuousFund(ctx context.Context, recipientAddr string) (sdk.Coin, error) {
+	recipient, err := k.authKeeper.AddressCodec().StringToBytes(recipientAddr)
+	if err != nil {
+		return sdk.Coin{}, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
+	}
+
 	cf, err := k.ContinuousFund.Get(ctx, recipient)
 	if err != nil {
 		if errors.Is(err, collections.ErrNotFound) {
-			return sdk.Coin{}, fmt.Errorf("no continuous fund found for recipient: %s", recipient.String())
+			return sdk.Coin{}, fmt.Errorf("no continuous fund found for recipient: %s", recipientAddr)
 		}
-		return sdk.Coin{}, fmt.Errorf("get continuous fund failed for recipient: %s", recipient.String())
+		return sdk.Coin{}, fmt.Errorf("get continuous fund failed for recipient: %s", recipientAddr)
 	}
 	if cf.Expiry != nil && cf.Expiry.Before(k.environment.HeaderService.GetHeaderInfo(ctx).Time) {
-		return sdk.Coin{}, fmt.Errorf("cannot withdraw continuous funds: continuous fund expired for recipient: %s", recipient.String())
+		return sdk.Coin{}, fmt.Errorf("cannot withdraw continuous funds: continuous fund expired for recipient: %s", recipientAddr)
 	}
 
 	toDistributeAmount, err := k.ToDistribute.Get(ctx)
@@ -138,15 +143,20 @@ func (k Keeper) withdrawContinuousFund(ctx context.Context, recipient sdk.AccAdd
 	}
 
 	// withdraw continuous fund
-	withdrawnAmount, err := k.withdrawRecipientFunds(ctx, recipient)
+	withdrawnAmount, err := k.withdrawRecipientFunds(ctx, recipientAddr)
 	if err != nil {
-		return sdk.Coin{}, fmt.Errorf("error while withdrawing recipient funds for recipient: %s", recipient.String())
+		return sdk.Coin{}, fmt.Errorf("error while withdrawing recipient funds for recipient: %s", recipientAddr)
 	}
 
 	return withdrawnAmount, nil
 }
 
-func (k Keeper) withdrawRecipientFunds(ctx context.Context, recipient sdk.AccAddress) (sdk.Coin, error) {
+func (k Keeper) withdrawRecipientFunds(ctx context.Context, recipientAddr string) (sdk.Coin, error) {
+	recipient, err := k.authKeeper.AddressCodec().StringToBytes(recipientAddr)
+	if err != nil {
+		return sdk.Coin{}, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
+	}
+
 	// get allocated continuous fund
 	fundsAllocated, err := k.RecipientFundDistribution.Get(ctx, recipient)
 	if err != nil {
@@ -165,7 +175,7 @@ func (k Keeper) withdrawRecipientFunds(ctx context.Context, recipient sdk.AccAdd
 	withdrawnAmount := sdk.NewCoin(denom, fundsAllocated)
 	err = k.DistributeFromStreamFunds(ctx, sdk.NewCoins(withdrawnAmount), recipient)
 	if err != nil {
-		return sdk.Coin{}, fmt.Errorf("error while distributing funds to the recipient %s: %v", recipient.String(), err)
+		return sdk.Coin{}, fmt.Errorf("error while distributing funds to the recipient %s: %v", recipientAddr, err)
 	}
 
 	// reset fund distribution
@@ -257,8 +267,12 @@ func (k Keeper) iterateAndUpdateFundsDistribution(ctx context.Context, toDistrib
 
 	// Calculate totalPercentageToBeDistributed and store values
 	err := k.RecipientFundPercentage.Walk(ctx, nil, func(key sdk.AccAddress, value math.Int) (stop bool, err error) {
+		addr, err := k.authKeeper.AddressCodec().BytesToString(key)
+		if err != nil {
+			return true, err
+		}
 		totalPercentageToBeDistributed = totalPercentageToBeDistributed.Add(value)
-		recipientFundMap[key.String()] = value
+		recipientFundMap[addr] = value
 		return false, nil
 	})
 	if err != nil {
@@ -306,9 +320,14 @@ func (k Keeper) iterateAndUpdateFundsDistribution(ctx context.Context, toDistrib
 	return k.ToDistribute.Set(ctx, math.ZeroInt())
 }
 
-func (k Keeper) claimFunds(ctx context.Context, recipient sdk.AccAddress) (amount sdk.Coin, err error) {
+func (k Keeper) claimFunds(ctx context.Context, recipientAddr string) (amount sdk.Coin, err error) {
+	recipient, err := k.authKeeper.AddressCodec().StringToBytes(recipientAddr)
+	if err != nil {
+		return sdk.Coin{}, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
+	}
+
 	// get claimable funds from distribution info
-	amount, err = k.getClaimableFunds(ctx, recipient)
+	amount, err = k.getClaimableFunds(ctx, recipientAddr)
 	if err != nil {
 		return sdk.Coin{}, fmt.Errorf("error getting claimable funds: %w", err)
 	}
@@ -322,11 +341,16 @@ func (k Keeper) claimFunds(ctx context.Context, recipient sdk.AccAddress) (amoun
 	return amount, nil
 }
 
-func (k Keeper) getClaimableFunds(ctx context.Context, recipient sdk.AccAddress) (amount sdk.Coin, err error) {
+func (k Keeper) getClaimableFunds(ctx context.Context, recipientAddr string) (amount sdk.Coin, err error) {
+	recipient, err := k.authKeeper.AddressCodec().StringToBytes(recipientAddr)
+	if err != nil {
+		return sdk.Coin{}, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
+	}
+
 	budget, err := k.BudgetProposal.Get(ctx, recipient)
 	if err != nil {
 		if errors.Is(err, collections.ErrNotFound) {
-			return sdk.Coin{}, fmt.Errorf("no budget found for recipient: %s", recipient.String())
+			return sdk.Coin{}, fmt.Errorf("no budget found for recipient: %s", recipientAddr)
 		}
 		return sdk.Coin{}, err
 	}
@@ -340,7 +364,7 @@ func (k Keeper) getClaimableFunds(ctx context.Context, recipient sdk.AccAddress)
 				return sdk.Coin{}, err
 			}
 			// Return the end of the budget
-			return sdk.Coin{}, fmt.Errorf("budget ended for recipient: %s", recipient.String())
+			return sdk.Coin{}, fmt.Errorf("budget ended for recipient: %s", recipientAddr)
 		}
 	}
 

x/protocolpool/keeper/keeper_test.go

@@ -68,13 +68,16 @@ func (s *KeeperTestSuite) SetupTest() {
 	stakingKeeper.EXPECT().BondDenom(ctx).Return("stake", nil).AnyTimes()
 	s.stakingKeeper = stakingKeeper
 
+	authority, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress(types.GovModuleName))
+	s.Require().NoError(err)
+
 	poolKeeper := poolkeeper.NewKeeper(
 		encCfg.Codec,
 		environment,
 		accountKeeper,
 		bankKeeper,
 		stakingKeeper,
-		authtypes.NewModuleAddress(types.GovModuleName).String(),
+		authority,
 	)
 	s.ctx = ctx
 	s.poolKeeper = poolKeeper

x/protocolpool/keeper/msg_server.go

@@ -26,12 +26,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer {
 }
 
 func (k MsgServer) ClaimBudget(ctx context.Context, msg *types.MsgClaimBudget) (*types.MsgClaimBudgetResponse, error) {
-	recipient, err := k.Keeper.authKeeper.AddressCodec().StringToBytes(msg.RecipientAddress)
-	if err != nil {
-		return nil, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
-	}
-
-	amount, err := k.claimFunds(ctx, recipient)
+	amount, err := k.claimFunds(ctx, msg.RecipientAddress)
 	if err != nil {
 		return nil, err
 	}
@@ -164,12 +159,7 @@ func (k MsgServer) CreateContinuousFund(ctx context.Context, msg *types.MsgCreat
 }
 
 func (k MsgServer) WithdrawContinuousFund(ctx context.Context, msg *types.MsgWithdrawContinuousFund) (*types.MsgWithdrawContinuousFundResponse, error) {
-	recipient, err := k.Keeper.authKeeper.AddressCodec().StringToBytes(msg.RecipientAddress)
-	if err != nil {
-		return nil, sdkerrors.ErrInvalidAddress.Wrapf("invalid recipient address: %s", err)
-	}
-
-	amount, err := k.withdrawContinuousFund(ctx, recipient)
+	amount, err := k.withdrawContinuousFund(ctx, msg.RecipientAddress)
 	if err != nil {
 		return nil, err
 	}
@@ -202,7 +192,7 @@ func (k MsgServer) CancelContinuousFund(ctx context.Context, msg *types.MsgCance
 	}
 
 	// withdraw funds if any are allocated
-	withdrawnFunds, err := k.withdrawRecipientFunds(ctx, recipient)
+	withdrawnFunds, err := k.withdrawRecipientFunds(ctx, msg.RecipientAddress)
 	if err != nil && !errorspkg.Is(err, types.ErrNoRecipientFund) {
 		return nil, fmt.Errorf("error while withdrawing already allocated funds for recipient %s: %v", msg.RecipientAddress, err)
 	}