From 400ff0c13c4c59bb8f242c758fd2f5afdd932d17 Mon Sep 17 00:00:00 2001 From: Danilo Pantani Date: Wed, 16 Oct 2024 14:59:52 -0300 Subject: [PATCH] fix accaddress parse --- .../keeper/msg_server_create_chain_test.go | 4 ++-- .../keeper/msg_server_revert_launch_test.go | 3 +-- .../keeper/msg_server_send_request_test.go | 6 ++--- .../keeper/msg_server_settle_request_test.go | 4 ++-- .../keeper/msg_server_trigger_launch_test.go | 4 +--- x/launch/keeper/request_test.go | 22 +++++++++---------- x/launch/simulation/helpers.go | 8 +++---- x/monitoringc/simulation/helpers.go | 16 ++++++++++---- x/monitoringp/simulation/helpers.go | 16 ++++++++++---- x/participation/keeper/invariants_test.go | 3 ++- .../keeper/msg_server_participate_test.go | 4 ++-- .../msg_server_withdraw_allocations_test.go | 4 ++-- x/profile/simulation/helpers.go | 16 ++++++++++---- .../keeper/msg_server_burn_vouchers_test.go | 2 +- .../keeper/msg_server_create_project_test.go | 4 ++-- .../keeper/msg_server_mint_vouchers_test.go | 2 +- .../keeper/msg_server_redeem_vouchers_test.go | 10 +++++---- .../keeper/msg_server_unredeem_vouchers.go | 2 +- .../msg_server_unredeem_vouchers_test.go | 10 ++++----- 19 files changed, 82 insertions(+), 58 deletions(-) diff --git a/x/launch/keeper/msg_server_create_chain_test.go b/x/launch/keeper/msg_server_create_chain_test.go index e9731824..cbf193ea 100644 --- a/x/launch/keeper/msg_server_create_chain_test.go +++ b/x/launch/keeper/msg_server_create_chain_test.go @@ -41,7 +41,7 @@ func initCreationFeeAndFundCoordAccounts( // add `coins` to balance of each coordinator address // using `project` module account for minting as `launch` does not have one for _, addr := range addrs { - accAddr, err := sdk.AccAddressFromBech32(addr) + accAddr, err := keeper.AddressCodec().StringToBytes(addr) require.NoError(t, err) err = bk.MintCoins(ctx, projecttypes.ModuleName, coins) require.NoError(t, err) @@ -146,7 +146,7 @@ func TestMsgCreateChain(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { // get account initial balance - accAddr, err := sdk.AccAddressFromBech32(tc.msg.Coordinator) + accAddr, err := tk.LaunchKeeper.AddressCodec().StringToBytes(tc.msg.Coordinator) require.NoError(t, err) preBalance := tk.BankKeeper.SpendableCoins(ctx, accAddr) diff --git a/x/launch/keeper/msg_server_revert_launch_test.go b/x/launch/keeper/msg_server_revert_launch_test.go index 552b1ce3..da347425 100644 --- a/x/launch/keeper/msg_server_revert_launch_test.go +++ b/x/launch/keeper/msg_server_revert_launch_test.go @@ -4,7 +4,6 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" testkeeper "github.com/ignite/network/testutil/keeper" @@ -229,7 +228,7 @@ func TestMsgRevertLaunch(t *testing.T) { if !tt.inputState.noCoordinator { err = tk.ProfileKeeper.Coordinator.Set(ctx, tt.inputState.coordinator.CoordinatorID, tt.inputState.coordinator) require.NoError(t, err) - addr, err := sdk.AccAddressFromBech32(tt.inputState.coordinator.Address) + addr, err := tk.ProfileKeeper.AddressCodec().StringToBytes(tt.inputState.coordinator.Address) require.NoError(t, err) err = tk.ProfileKeeper.CoordinatorByAddress.Set(ctx, addr, profiletypes.CoordinatorByAddress{ Address: tt.inputState.coordinator.Address, diff --git a/x/launch/keeper/msg_server_send_request_test.go b/x/launch/keeper/msg_server_send_request_test.go index 69137283..f61420b5 100644 --- a/x/launch/keeper/msg_server_send_request_test.go +++ b/x/launch/keeper/msg_server_send_request_test.go @@ -271,7 +271,7 @@ func TestMsgRequestAddAccount(t *testing.T) { if !tt.inputState.noCoordinator { err := tk.ProfileKeeper.Coordinator.Set(ctx, tt.inputState.coordinator.CoordinatorID, tt.inputState.coordinator) require.NoError(t, err) - addr, err := sdk.AccAddressFromBech32(tt.inputState.coordinator.Address) + addr, err := tk.ProfileKeeper.AddressCodec().StringToBytes(tt.inputState.coordinator.Address) require.NoError(t, err) err = tk.ProfileKeeper.CoordinatorByAddress.Set(ctx, addr, profiletypes.CoordinatorByAddress{ CoordinatorID: tt.inputState.coordinator.CoordinatorID, @@ -284,9 +284,9 @@ func TestMsgRequestAddAccount(t *testing.T) { require.NoError(t, err) } if !tt.inputState.noAccount { - addr, err := sdk.AccAddressFromBech32(tt.inputState.account.Address) + addr, err := tk.LaunchKeeper.AddressCodec().StringToBytes(tt.inputState.account.Address) require.NoError(t, err) - err = tk.LaunchKeeper.GenesisAccount.Set(ctx, collections.Join(tt.inputState.account.LaunchID, addr), tt.inputState.account) + err = tk.LaunchKeeper.GenesisAccount.Set(ctx, collections.Join(tt.inputState.account.LaunchID, sdk.AccAddress(addr)), tt.inputState.account) require.NoError(t, err) } if !tt.inputState.fee.Empty() { diff --git a/x/launch/keeper/msg_server_settle_request_test.go b/x/launch/keeper/msg_server_settle_request_test.go index f35962ab..e44150c8 100644 --- a/x/launch/keeper/msg_server_settle_request_test.go +++ b/x/launch/keeper/msg_server_settle_request_test.go @@ -231,8 +231,8 @@ func TestMsgSettleRequest(t *testing.T) { require.NoError(t, err, "request not found") require.Equal(t, tt.wantStatus, request.Status) - checkAddr, err := sdk.AccAddressFromBech32(tt.checkAddr) - _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(tt.msg.LaunchID, checkAddr)) + checkAddr, err := tk.LaunchKeeper.AddressCodec().StringToBytes(tt.checkAddr) + _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(tt.msg.LaunchID, sdk.AccAddress(checkAddr))) if tt.msg.Approve { require.NoError(t, err, "request apply performed") } else { diff --git a/x/launch/keeper/msg_server_trigger_launch_test.go b/x/launch/keeper/msg_server_trigger_launch_test.go index c6ff0fd7..dbdb6aa6 100644 --- a/x/launch/keeper/msg_server_trigger_launch_test.go +++ b/x/launch/keeper/msg_server_trigger_launch_test.go @@ -4,8 +4,6 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/require" testkeeper "github.com/ignite/network/testutil/keeper" @@ -194,7 +192,7 @@ func TestMsgTriggerLaunch(t *testing.T) { if !tt.inputState.noCoordinator { err := tk.ProfileKeeper.Coordinator.Set(ctx, tt.inputState.coordinator.CoordinatorID, tt.inputState.coordinator) require.NoError(t, err) - addr, err := sdk.AccAddressFromBech32(tt.inputState.coordinator.Address) + addr, err := tk.ProfileKeeper.AddressCodec().StringToBytes(tt.inputState.coordinator.Address) require.NoError(t, err) err = tk.ProfileKeeper.CoordinatorByAddress.Set(ctx, addr, profiletypes.CoordinatorByAddress{ Address: tt.inputState.coordinator.Address, diff --git a/x/launch/keeper/request_test.go b/x/launch/keeper/request_test.go index ac423f8f..53eef4f7 100644 --- a/x/launch/keeper/request_test.go +++ b/x/launch/keeper/request_test.go @@ -213,35 +213,35 @@ func TestApplyRequest(t *testing.T) { switch requestContent := tt.request.Content.Content.(type) { case *types.RequestContent_GenesisAccount: ga := requestContent.GenesisAccount - address, err := sdk.AccAddressFromBech32(ga.Address) + address, err := tk.LaunchKeeper.AddressCodec().StringToBytes(ga.Address) require.NoError(t, err) - _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.NoError(t, err, "genesis account not found") case *types.RequestContent_VestingAccount: va := requestContent.VestingAccount - address, err := sdk.AccAddressFromBech32(va.Address) + address, err := tk.LaunchKeeper.AddressCodec().StringToBytes(va.Address) require.NoError(t, err) - _, err = tk.LaunchKeeper.VestingAccount.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.VestingAccount.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.NoError(t, err, "vesting account not found") case *types.RequestContent_AccountRemoval: ar := requestContent.AccountRemoval - address, err := sdk.AccAddressFromBech32(ar.Address) + address, err := tk.LaunchKeeper.AddressCodec().StringToBytes(ar.Address) require.NoError(t, err) - _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.GenesisAccount.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.Error(t, err, "genesis account not removed") - _, err = tk.LaunchKeeper.VestingAccount.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.VestingAccount.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.Error(t, err, "vesting account not removed") case *types.RequestContent_GenesisValidator: ga := requestContent.GenesisValidator - address, err := sdk.AccAddressFromBech32(ga.Address) + address, err := tk.LaunchKeeper.AddressCodec().StringToBytes(ga.Address) require.NoError(t, err) - _, err = tk.LaunchKeeper.GenesisValidator.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.GenesisValidator.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.NoError(t, err, "genesis validator not found") case *types.RequestContent_ValidatorRemoval: vr := requestContent.ValidatorRemoval - address, err := sdk.AccAddressFromBech32(vr.ValAddress) + address, err := tk.LaunchKeeper.AddressCodec().StringToBytes(vr.ValAddress) require.NoError(t, err) - _, err = tk.LaunchKeeper.GenesisValidator.Get(ctx, collections.Join(launchID, address)) + _, err = tk.LaunchKeeper.GenesisValidator.Get(ctx, collections.Join(launchID, sdk.AccAddress(address))) require.Error(t, err, "genesis validator not removed") } }) diff --git a/x/launch/simulation/helpers.go b/x/launch/simulation/helpers.go index 10ea1069..bba1bcfe 100644 --- a/x/launch/simulation/helpers.go +++ b/x/launch/simulation/helpers.go @@ -22,12 +22,12 @@ func IsLaunchTriggeredChain(ctx sdk.Context, k *keeper.Keeper, chainID uint64) b } // FindAccount find account by string hex address -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, error) { - coordAddr, err := sdk.AccAddressFromBech32(address) +func FindAccount(k *keeper.Keeper, accs []simtypes.Account, address string) (simtypes.Account, error) { + coordinatorAddress, err := k.AddressCodec().StringToBytes(address) if err != nil { return simtypes.Account{}, err } - simAccount, found := simtypes.FindAccount(accs, coordAddr) + simAccount, found := simtypes.FindAccount(accs, sdk.AccAddress(coordinatorAddress)) if !found { return simAccount, fmt.Errorf("address %s not found in the sim accounts", address) } @@ -125,7 +125,7 @@ func FindChainCoordinatorAccount( return simtypes.Account{}, fmt.Errorf("coordinator %d inactive", chain.CoordinatorID) } - return FindAccount(accs, coord.Address) + return FindAccount(k, accs, coord.Address) } // FindRandomChain find a random chain from store diff --git a/x/monitoringc/simulation/helpers.go b/x/monitoringc/simulation/helpers.go index 92c437c0..676c4678 100644 --- a/x/monitoringc/simulation/helpers.go +++ b/x/monitoringc/simulation/helpers.go @@ -1,15 +1,23 @@ package simulation import ( + "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + + "github.com/ignite/network/x/monitoringc/keeper" ) // FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) +func FindAccount(k keeper.Keeper, accs []simtypes.Account, address string) (simtypes.Account, error) { + creator, err := k.AddressCodec().StringToBytes(address) if err != nil { - panic(err) + return simtypes.Account{}, err + } + simAccount, found := simtypes.FindAccount(accs, sdk.AccAddress(creator)) + if !found { + return simAccount, fmt.Errorf("address %s not found in the sim accounts", address) } - return simtypes.FindAccount(accs, creator) + return simAccount, nil } diff --git a/x/monitoringp/simulation/helpers.go b/x/monitoringp/simulation/helpers.go index 92c437c0..7e005f24 100644 --- a/x/monitoringp/simulation/helpers.go +++ b/x/monitoringp/simulation/helpers.go @@ -1,15 +1,23 @@ package simulation import ( + "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + + "github.com/ignite/network/x/monitoringp/keeper" ) // FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) +func FindAccount(k keeper.Keeper, accs []simtypes.Account, address string) (simtypes.Account, error) { + creator, err := k.AddressCodec().StringToBytes(address) if err != nil { - panic(err) + return simtypes.Account{}, err + } + simAccount, found := simtypes.FindAccount(accs, sdk.AccAddress(creator)) + if !found { + return simAccount, fmt.Errorf("address %s not found in the sim accounts", address) } - return simtypes.FindAccount(accs, creator) + return simAccount, nil } diff --git a/x/participation/keeper/invariants_test.go b/x/participation/keeper/invariants_test.go index 35156c91..9c1b0b2f 100644 --- a/x/participation/keeper/invariants_test.go +++ b/x/participation/keeper/invariants_test.go @@ -47,8 +47,9 @@ func TestMismatchUsedAllocationsInvariant(t *testing.T) { NumAllocations: sdkmath.NewInt(2), } ) - accAddr, err := sdk.AccAddressFromBech32(addr) + byteAddr, err := tk.ParticipationKeeper.AddressCodec().StringToBytes(addr) require.NoError(t, err) + accAddr := sdk.AccAddress(byteAddr) t.Run("should allow valid case", func(t *testing.T) { err := tk.ParticipationKeeper.UsedAllocations.Set(ctx, accAddr.String(), validUsedAllocs) diff --git a/x/participation/keeper/msg_server_participate_test.go b/x/participation/keeper/msg_server_participate_test.go index d1fd19f7..4307349b 100644 --- a/x/participation/keeper/msg_server_participate_test.go +++ b/x/participation/keeper/msg_server_participate_test.go @@ -240,9 +240,9 @@ func Test_msgServer_Participate(t *testing.T) { require.EqualValues(t, tt.desiredUsedAlloc, usedAllocations.NumAllocations) // check valid auction used allocations entry for bidder exists - participantAddress, err := sdk.AccAddressFromBech32(tt.msg.Participant) + participantAddress, err := tk.ParticipationKeeper.AddressCodec().StringToBytes(tt.msg.Participant) require.NoError(t, err) - auctionUsedAllocations, err := tk.ParticipationKeeper.AuctionUsedAllocations.Get(tmpCtx, collections.Join(participantAddress, tt.msg.AuctionID)) + auctionUsedAllocations, err := tk.ParticipationKeeper.AuctionUsedAllocations.Get(tmpCtx, collections.Join(sdk.AccAddress(participantAddress), tt.msg.AuctionID)) require.NoError(t, err) require.Equal(t, tier.RequiredAllocations, auctionUsedAllocations.NumAllocations) require.False(t, auctionUsedAllocations.Withdrawn) diff --git a/x/participation/keeper/msg_server_withdraw_allocations_test.go b/x/participation/keeper/msg_server_withdraw_allocations_test.go index ba440052..5bd9eb78 100644 --- a/x/participation/keeper/msg_server_withdraw_allocations_test.go +++ b/x/participation/keeper/msg_server_withdraw_allocations_test.go @@ -161,9 +161,9 @@ func Test_msgServer_WithdrawAllocations(t *testing.T) { require.NoError(t, err) // check auctionUsedAllocations is set to `withdrawn` - participantAddress, err := sdk.AccAddressFromBech32(tt.msg.Participant) + participantAddress, err := tk.ParticipationKeeper.AddressCodec().StringToBytes(tt.msg.Participant) require.NoError(t, err) - postAuctionUsedAllocations, err := tk.ParticipationKeeper.AuctionUsedAllocations.Get(tmpCtx, collections.Join(participantAddress, tt.msg.AuctionID)) + postAuctionUsedAllocations, err := tk.ParticipationKeeper.AuctionUsedAllocations.Get(tmpCtx, collections.Join(sdk.AccAddress(participantAddress), tt.msg.AuctionID)) require.NoError(t, err) require.True(t, postAuctionUsedAllocations.Withdrawn) require.Equal(t, preAuctionUsedAllocations.NumAllocations, postAuctionUsedAllocations.NumAllocations) diff --git a/x/profile/simulation/helpers.go b/x/profile/simulation/helpers.go index 92c437c0..ffc5d694 100644 --- a/x/profile/simulation/helpers.go +++ b/x/profile/simulation/helpers.go @@ -1,15 +1,23 @@ package simulation import ( + "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + + "github.com/ignite/network/x/profile/keeper" ) // FindAccount find a specific address from an account list -func FindAccount(accs []simtypes.Account, address string) (simtypes.Account, bool) { - creator, err := sdk.AccAddressFromBech32(address) +func FindAccount(k *keeper.Keeper, accs []simtypes.Account, address string) (simtypes.Account, error) { + creator, err := k.AddressCodec().StringToBytes(address) if err != nil { - panic(err) + return simtypes.Account{}, err + } + simAccount, found := simtypes.FindAccount(accs, sdk.AccAddress(creator)) + if !found { + return simAccount, fmt.Errorf("address %s not found in the sim accounts", address) } - return simtypes.FindAccount(accs, creator) + return simAccount, nil } diff --git a/x/project/keeper/msg_server_burn_vouchers_test.go b/x/project/keeper/msg_server_burn_vouchers_test.go index 3c002ba9..6b3ad0fe 100644 --- a/x/project/keeper/msg_server_burn_vouchers_test.go +++ b/x/project/keeper/msg_server_burn_vouchers_test.go @@ -143,7 +143,7 @@ func TestMsgBurnVouchers(t *testing.T) { previousProject, err = tk.ProjectKeeper.GetProject(ctx, tc.msg.ProjectID) require.NoError(t, err) - creatorAddr, err = sdk.AccAddressFromBech32(tc.msg.Sender) + creatorAddr, err = tk.ProjectKeeper.AddressCodec().StringToBytes(tc.msg.Sender) require.NoError(t, err) previousBalance = tk.BankKeeper.GetAllBalances(ctx, creatorAddr) } diff --git a/x/project/keeper/msg_server_create_project_test.go b/x/project/keeper/msg_server_create_project_test.go index 54a6e2a2..970ebdfd 100644 --- a/x/project/keeper/msg_server_create_project_test.go +++ b/x/project/keeper/msg_server_create_project_test.go @@ -38,7 +38,7 @@ func initCreationFeeAndFundCoordAccounts( t.Run("should add coins to balance of each coordinator address", func(t *testing.T) { for _, addr := range addrs { - accAddr, err := sdk.AccAddressFromBech32(addr) + accAddr, err := keeper.AddressCodec().StringToBytes(addr) require.NoError(t, err) err = bk.MintCoins(ctx, types.ModuleName, coins) require.NoError(t, err) @@ -141,7 +141,7 @@ func TestMsgCreateProject(t *testing.T) { } { t.Run(tc.name, func(t *testing.T) { // get account initial balance - accAddr, err := sdk.AccAddressFromBech32(tc.msg.Coordinator) + accAddr, err := tk.ProjectKeeper.AddressCodec().StringToBytes(tc.msg.Coordinator) require.NoError(t, err) preBalance := tk.BankKeeper.SpendableCoins(ctx, accAddr) diff --git a/x/project/keeper/msg_server_mint_vouchers_test.go b/x/project/keeper/msg_server_mint_vouchers_test.go index b138ad0a..6e5d1e68 100644 --- a/x/project/keeper/msg_server_mint_vouchers_test.go +++ b/x/project/keeper/msg_server_mint_vouchers_test.go @@ -118,7 +118,7 @@ func TestMsgMintVouchers(t *testing.T) { var previousProject types.Project var previousBalance sdk.Coins - coordAddr, err := sdk.AccAddressFromBech32(tc.msg.Coordinator) + coordAddr, err := tk.ProjectKeeper.AddressCodec().StringToBytes(tc.msg.Coordinator) require.NoError(t, err) // Get values before message execution diff --git a/x/project/keeper/msg_server_redeem_vouchers_test.go b/x/project/keeper/msg_server_redeem_vouchers_test.go index 3fe989e1..97d6f07d 100644 --- a/x/project/keeper/msg_server_redeem_vouchers_test.go +++ b/x/project/keeper/msg_server_redeem_vouchers_test.go @@ -8,7 +8,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - ignterrors "github.com/ignite/network/pkg/errors" networktypes "github.com/ignite/network/pkg/types" testkeeper "github.com/ignite/network/testutil/keeper" "github.com/ignite/network/testutil/sample" @@ -53,6 +52,9 @@ func TestMsgRedeemVouchers(t *testing.T) { vouchersErr, err := types.SharesToVouchers(shares, invalidProjectID) require.NoError(t, err) + vouchersMainnet, err := types.SharesToVouchers(shares, projectMainnetLaunched.ProjectID) + require.NoError(t, err) + t.Run("should allow setting test balances", func(t *testing.T) { err = tk.BankKeeper.MintCoins(ctx, types.ModuleName, vouchers) require.NoError(t, err) @@ -130,7 +132,7 @@ func TestMsgRedeemVouchers(t *testing.T) { ProjectID: project.ProjectID, Vouchers: vouchersErr, }, - err: ignterrors.ErrCritical, + err: types.ErrNoMatchVouchers, }, { name: "should fail with invalid sender address", @@ -179,7 +181,7 @@ func TestMsgRedeemVouchers(t *testing.T) { Sender: addr.String(), Account: addr.String(), ProjectID: projectMainnetLaunched.ProjectID, - Vouchers: vouchers, + Vouchers: vouchersMainnet, }, err: types.ErrMainnetLaunchTriggered, }, @@ -192,7 +194,7 @@ func TestMsgRedeemVouchers(t *testing.T) { // Get values before message execution if tc.err == nil { - accountAddr, err = sdk.AccAddressFromBech32(tc.msg.Account) + accountAddr, err = tk.ProjectKeeper.AddressCodec().StringToBytes(tc.msg.Account) require.NoError(t, err) previousAccount, err = tk.ProjectKeeper.GetMainnetAccount(ctx, tc.msg.ProjectID, accountAddr) diff --git a/x/project/keeper/msg_server_unredeem_vouchers.go b/x/project/keeper/msg_server_unredeem_vouchers.go index 2aaf03f7..3dfae139 100644 --- a/x/project/keeper/msg_server_unredeem_vouchers.go +++ b/x/project/keeper/msg_server_unredeem_vouchers.go @@ -41,7 +41,7 @@ func (k msgServer) UnredeemVouchers(ctx context.Context, msg *types.MsgUnredeemV // Check if the account already exists account, err := k.MainnetAccount.Get(ctx, collections.Join(msg.ProjectID, sdk.AccAddress(sender))) if err != nil { - return nil, ignterrors.Criticalf("can't get mainnet account %s", err.Error()) + return nil, sdkerrors.Wrapf(types.ErrAccountNotFound, "%s: %s", err.Error(), msg.Sender) } // Update the shares of the account diff --git a/x/project/keeper/msg_server_unredeem_vouchers_test.go b/x/project/keeper/msg_server_unredeem_vouchers_test.go index 4d34921b..6e597204 100644 --- a/x/project/keeper/msg_server_unredeem_vouchers_test.go +++ b/x/project/keeper/msg_server_unredeem_vouchers_test.go @@ -44,14 +44,14 @@ func TestMsgUnredeemVouchers(t *testing.T) { require.NoError(t, err) // Create accounts - accountAddress, err := sdk.AccAddressFromBech32(account.Address) + accountAddress, err := tk.ProjectKeeper.AddressCodec().StringToBytes(account.Address) require.NoError(t, err) - err = tk.ProjectKeeper.MainnetAccount.Set(ctx, collections.Join(projectID, accountAddress), account) + err = tk.ProjectKeeper.MainnetAccount.Set(ctx, collections.Join(projectID, sdk.AccAddress(accountAddress)), account) require.NoError(t, err) - accountFewSharesAddress, err := sdk.AccAddressFromBech32(accountFewShares.Address) + accountFewSharesAddress, err := tk.ProjectKeeper.AddressCodec().StringToBytes(accountFewShares.Address) require.NoError(t, err) - err = tk.ProjectKeeper.MainnetAccount.Set(ctx, collections.Join(projectID, accountFewSharesAddress), accountFewShares) + err = tk.ProjectKeeper.MainnetAccount.Set(ctx, collections.Join(projectID, sdk.AccAddress(accountFewSharesAddress)), accountFewShares) require.NoError(t, err) for _, tc := range []struct { @@ -132,7 +132,7 @@ func TestMsgUnredeemVouchers(t *testing.T) { var previousAccount types.MainnetAccount var previousBalance sdk.Coins - accountAddr, err := sdk.AccAddressFromBech32(tc.msg.Sender) + accountAddr, err := tk.ProjectKeeper.AddressCodec().StringToBytes(tc.msg.Sender) require.NoError(t, err) // Get values before message execution