From ecfe26a707480e49c3cc415fcf554f3235815425 Mon Sep 17 00:00:00 2001 From: John Letey Date: Fri, 4 Oct 2024 13:23:32 +0200 Subject: [PATCH] chore: miscellaneous improvements --- Makefile | 2 +- simapp/app.go | 6 +- simapp/simd/cmd/root.go | 2 +- utils/mocks/aura.go | 5 +- x/aura/genesis.go | 5 +- x/aura/keeper/keeper.go | 20 ++- x/aura/keeper/msg_server.go | 96 ++++-------- x/aura/keeper/msg_server_blocklist.go | 29 ++-- x/aura/keeper/msg_server_blocklist_test.go | 37 ++--- x/aura/keeper/msg_server_test.go | 156 +++++++++---------- x/aura/keeper/query_server.go | 25 +-- x/aura/keeper/query_server_blocklist.go | 13 +- x/aura/keeper/query_server_blocklist_test.go | 24 ++- x/aura/keeper/query_server_test.go | 48 +++--- x/aura/module.go | 17 +- x/aura/types/blocklist/codec.go | 5 +- x/aura/types/blocklist/genesis.go | 10 +- x/aura/types/codec.go | 5 +- x/aura/types/genesis.go | 20 ++- 19 files changed, 225 insertions(+), 300 deletions(-) diff --git a/Makefile b/Makefile index f442ce2..22dff7d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: proto-format proto-lint proto-breaking proto-gen format lint test-unit build local-image test-e2e -all: proto-all format test-unit build local-image test-e2e +all: proto-all format lint test-unit build local-image test-e2e ############################################################################### ### Build ### diff --git a/simapp/app.go b/simapp/app.go index bdfb9e5..0a23c1b 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -148,13 +148,15 @@ func NewSimApp( return nil, err } app.AuraKeeper = aurakeeper.NewKeeper( - runtime.NewKVStoreService(app.GetKey(auratypes.ModuleName)), "ausdy", + runtime.NewKVStoreService(app.GetKey(auratypes.ModuleName)), + runtime.ProvideEventService(), + app.AccountKeeper.AddressCodec(), nil, ) app.BankKeeper.AppendSendRestriction(app.AuraKeeper.SendRestrictionFn) app.AuraKeeper.SetBankKeeper(app.BankKeeper) - if err := app.RegisterModules(aura.NewAppModule(app.AuraKeeper)); err != nil { + if err := app.RegisterModules(aura.NewAppModule(app.AccountKeeper.AddressCodec(), app.AuraKeeper)); err != nil { return nil, err } diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index 78ff897..39b61ab 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -111,7 +111,7 @@ func NewRootCmd() *cobra.Command { ibcexported.ModuleName: ibc.AppModule{}, transfertypes.ModuleName: transfer.AppModule{}, tendermint.ModuleName: tendermint.AppModule{}, - auratypes.ModuleName: aura.AppModule{}, + auratypes.ModuleName: aura.NewAppModule(autoCliOpts.AddressCodec, nil), } for name, mod := range modules { moduleBasicManager[name] = module.CoreAppModuleBasicAdaptor(name, mod) diff --git a/utils/mocks/aura.go b/utils/mocks/aura.go index 362b8bc..6cd19e6 100644 --- a/utils/mocks/aura.go +++ b/utils/mocks/aura.go @@ -2,6 +2,7 @@ package mocks import ( storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" @@ -20,8 +21,10 @@ func AuraKeeperWithBank(bank BankKeeper) (*keeper.Keeper, sdk.Context) { tkey := storetypes.NewTransientStoreKey("transient_aura") k := keeper.NewKeeper( - runtime.NewKVStoreService(key), "ausdy", + runtime.NewKVStoreService(key), + runtime.ProvideEventService(), + address.NewBech32Codec("noble"), nil, ) diff --git a/x/aura/genesis.go b/x/aura/genesis.go index 0734e17..82652f3 100644 --- a/x/aura/genesis.go +++ b/x/aura/genesis.go @@ -1,17 +1,18 @@ package aura import ( + "cosmossdk.io/core/address" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper" "github.com/ondoprotocol/usdy-noble/v2/x/aura/types" "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist" ) -func InitGenesis(ctx sdk.Context, k *keeper.Keeper, genesis types.GenesisState) { +func InitGenesis(ctx sdk.Context, k *keeper.Keeper, addressCodec address.Codec, genesis types.GenesisState) { k.SetBlocklistOwner(ctx, genesis.BlocklistState.Owner) k.SetBlocklistPendingOwner(ctx, genesis.BlocklistState.PendingOwner) for _, account := range genesis.BlocklistState.BlockedAddresses { - address, _ := sdk.AccAddressFromBech32(account) + address, _ := addressCodec.StringToBytes(account) k.SetBlockedAddress(ctx, address) } diff --git a/x/aura/keeper/keeper.go b/x/aura/keeper/keeper.go index 8e7cd63..86f6287 100644 --- a/x/aura/keeper/keeper.go +++ b/x/aura/keeper/keeper.go @@ -4,6 +4,8 @@ import ( "context" "fmt" + "cosmossdk.io/core/address" + "cosmossdk.io/core/event" "cosmossdk.io/core/store" sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" @@ -11,22 +13,30 @@ import ( ) type Keeper struct { + Denom string + storeService store.KVStoreService + eventService event.Service - Denom string - bankKeeper types.BankKeeper + addressCodec address.Codec + bankKeeper types.BankKeeper } func NewKeeper( - storeService store.KVStoreService, denom string, + storeService store.KVStoreService, + eventService event.Service, + addressCodec address.Codec, bankKeeper types.BankKeeper, ) *Keeper { return &Keeper{ + Denom: denom, + storeService: storeService, + eventService: eventService, - Denom: denom, - bankKeeper: bankKeeper, + addressCodec: addressCodec, + bankKeeper: bankKeeper, } } diff --git a/x/aura/keeper/msg_server.go b/x/aura/keeper/msg_server.go index e6d5a89..b582546 100644 --- a/x/aura/keeper/msg_server.go +++ b/x/aura/keeper/msg_server.go @@ -20,9 +20,7 @@ func NewMsgServer(keeper *Keeper) types.MsgServer { return &msgServer{Keeper: keeper} } -func (k msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types.MsgBurnResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) Burn(ctx context.Context, msg *types.MsgBurn) (*types.MsgBurnResponse, error) { if !k.HasBurner(ctx, msg.Signer) { return nil, types.ErrInvalidBurner } @@ -31,7 +29,7 @@ func (k msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types.MsgBu return nil, sdkerrors.Wrapf(types.ErrInsufficientAllowance, "burner %s has an allowance of %s", msg.Signer, allowance.String()) } - from, err := sdk.AccAddressFromBech32(msg.From) + from, err := k.addressCodec.StringToBytes(msg.From) if err != nil { return nil, sdkerrors.Wrapf(err, "unable to decode account address %s", msg.From) } @@ -56,9 +54,7 @@ func (k msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types.MsgBu return &types.MsgBurnResponse{}, nil } -func (k msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.MsgMintResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) Mint(ctx context.Context, msg *types.MsgMint) (*types.MsgMintResponse, error) { if !k.HasMinter(ctx, msg.Signer) { return nil, types.ErrInvalidMinter } @@ -67,7 +63,7 @@ func (k msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.MsgMi return nil, sdkerrors.Wrapf(types.ErrInsufficientAllowance, "minter %s has an allowance of %s", msg.Signer, allowance.String()) } - to, err := sdk.AccAddressFromBech32(msg.To) + to, err := k.addressCodec.StringToBytes(msg.To) if err != nil { return nil, sdkerrors.Wrapf(err, "unable to decode account address %s", msg.To) } @@ -92,9 +88,7 @@ func (k msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.MsgMi return &types.MsgMintResponse{}, nil } -func (k msgServer) Pause(goCtx context.Context, msg *types.MsgPause) (*types.MsgPauseResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) Pause(ctx context.Context, msg *types.MsgPause) (*types.MsgPauseResponse, error) { if !k.HasPauser(ctx, msg.Signer) { return nil, types.ErrInvalidPauser } @@ -104,14 +98,12 @@ func (k msgServer) Pause(goCtx context.Context, msg *types.MsgPause) (*types.Msg k.SetPaused(ctx, true) - return &types.MsgPauseResponse{}, ctx.EventManager().EmitTypedEvent(&types.Paused{ + return &types.MsgPauseResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.Paused{ Account: msg.Signer, }) } -func (k msgServer) Unpause(goCtx context.Context, msg *types.MsgUnpause) (*types.MsgUnpauseResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) Unpause(ctx context.Context, msg *types.MsgUnpause) (*types.MsgUnpauseResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -126,14 +118,12 @@ func (k msgServer) Unpause(goCtx context.Context, msg *types.MsgUnpause) (*types k.SetPaused(ctx, false) - return &types.MsgUnpauseResponse{}, ctx.EventManager().EmitTypedEvent(&types.Unpaused{ + return &types.MsgUnpauseResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.Unpaused{ Account: msg.Signer, }) } -func (k msgServer) TransferOwnership(goCtx context.Context, msg *types.MsgTransferOwnership) (*types.MsgTransferOwnershipResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) TransferOwnership(ctx context.Context, msg *types.MsgTransferOwnership) (*types.MsgTransferOwnershipResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -148,15 +138,13 @@ func (k msgServer) TransferOwnership(goCtx context.Context, msg *types.MsgTransf k.SetPendingOwner(ctx, msg.NewOwner) - return &types.MsgTransferOwnershipResponse{}, ctx.EventManager().EmitTypedEvent(&types.OwnershipTransferStarted{ + return &types.MsgTransferOwnershipResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.OwnershipTransferStarted{ PreviousOwner: owner, NewOwner: msg.NewOwner, }) } -func (k msgServer) AcceptOwnership(goCtx context.Context, msg *types.MsgAcceptOwnership) (*types.MsgAcceptOwnershipResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) AcceptOwnership(ctx context.Context, msg *types.MsgAcceptOwnership) (*types.MsgAcceptOwnershipResponse, error) { pendingOwner := k.GetPendingOwner(ctx) if pendingOwner == "" { return nil, types.ErrNoPendingOwner @@ -170,15 +158,13 @@ func (k msgServer) AcceptOwnership(goCtx context.Context, msg *types.MsgAcceptOw k.SetOwner(ctx, msg.Signer) k.DeletePendingOwner(ctx) - return &types.MsgAcceptOwnershipResponse{}, ctx.EventManager().EmitTypedEvent(&types.OwnershipTransferred{ + return &types.MsgAcceptOwnershipResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.OwnershipTransferred{ PreviousOwner: owner, NewOwner: msg.Signer, }) } -func (k msgServer) AddBurner(goCtx context.Context, msg *types.MsgAddBurner) (*types.MsgAddBurnerResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) AddBurner(ctx context.Context, msg *types.MsgAddBurner) (*types.MsgAddBurnerResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -197,15 +183,13 @@ func (k msgServer) AddBurner(goCtx context.Context, msg *types.MsgAddBurner) (*t k.SetBurner(ctx, msg.Burner, msg.Allowance) - return &types.MsgAddBurnerResponse{}, ctx.EventManager().EmitTypedEvent(&types.BurnerAdded{ + return &types.MsgAddBurnerResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.BurnerAdded{ Address: msg.Burner, Allowance: msg.Allowance, }) } -func (k msgServer) RemoveBurner(goCtx context.Context, msg *types.MsgRemoveBurner) (*types.MsgRemoveBurnerResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) RemoveBurner(ctx context.Context, msg *types.MsgRemoveBurner) (*types.MsgRemoveBurnerResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -220,14 +204,12 @@ func (k msgServer) RemoveBurner(goCtx context.Context, msg *types.MsgRemoveBurne k.DeleteBurner(ctx, msg.Burner) - return &types.MsgRemoveBurnerResponse{}, ctx.EventManager().EmitTypedEvent(&types.BurnerRemoved{ + return &types.MsgRemoveBurnerResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.BurnerRemoved{ Address: msg.Burner, }) } -func (k msgServer) SetBurnerAllowance(goCtx context.Context, msg *types.MsgSetBurnerAllowance) (*types.MsgSetBurnerAllowanceResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) SetBurnerAllowance(ctx context.Context, msg *types.MsgSetBurnerAllowance) (*types.MsgSetBurnerAllowanceResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -247,16 +229,14 @@ func (k msgServer) SetBurnerAllowance(goCtx context.Context, msg *types.MsgSetBu allowance := k.GetBurner(ctx, msg.Burner) k.SetBurner(ctx, msg.Burner, msg.Allowance) - return &types.MsgSetBurnerAllowanceResponse{}, ctx.EventManager().EmitTypedEvent(&types.BurnerUpdated{ + return &types.MsgSetBurnerAllowanceResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.BurnerUpdated{ Address: msg.Burner, PreviousAllowance: allowance, NewAllowance: msg.Allowance, }) } -func (k msgServer) AddMinter(goCtx context.Context, msg *types.MsgAddMinter) (*types.MsgAddMinterResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) AddMinter(ctx context.Context, msg *types.MsgAddMinter) (*types.MsgAddMinterResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -275,15 +255,13 @@ func (k msgServer) AddMinter(goCtx context.Context, msg *types.MsgAddMinter) (*t k.SetMinter(ctx, msg.Minter, msg.Allowance) - return &types.MsgAddMinterResponse{}, ctx.EventManager().EmitTypedEvent(&types.MinterAdded{ + return &types.MsgAddMinterResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.MinterAdded{ Address: msg.Minter, Allowance: msg.Allowance, }) } -func (k msgServer) RemoveMinter(goCtx context.Context, msg *types.MsgRemoveMinter) (*types.MsgRemoveMinterResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) RemoveMinter(ctx context.Context, msg *types.MsgRemoveMinter) (*types.MsgRemoveMinterResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -298,14 +276,12 @@ func (k msgServer) RemoveMinter(goCtx context.Context, msg *types.MsgRemoveMinte k.DeleteMinter(ctx, msg.Minter) - return &types.MsgRemoveMinterResponse{}, ctx.EventManager().EmitTypedEvent(&types.MinterRemoved{ + return &types.MsgRemoveMinterResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.MinterRemoved{ Address: msg.Minter, }) } -func (k msgServer) SetMinterAllowance(goCtx context.Context, msg *types.MsgSetMinterAllowance) (*types.MsgSetMinterAllowanceResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) SetMinterAllowance(ctx context.Context, msg *types.MsgSetMinterAllowance) (*types.MsgSetMinterAllowanceResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -325,16 +301,14 @@ func (k msgServer) SetMinterAllowance(goCtx context.Context, msg *types.MsgSetMi allowance := k.GetMinter(ctx, msg.Minter) k.SetMinter(ctx, msg.Minter, msg.Allowance) - return &types.MsgSetMinterAllowanceResponse{}, ctx.EventManager().EmitTypedEvent(&types.MinterUpdated{ + return &types.MsgSetMinterAllowanceResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.MinterUpdated{ Address: msg.Minter, PreviousAllowance: allowance, NewAllowance: msg.Allowance, }) } -func (k msgServer) AddPauser(goCtx context.Context, msg *types.MsgAddPauser) (*types.MsgAddPauserResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) AddPauser(ctx context.Context, msg *types.MsgAddPauser) (*types.MsgAddPauserResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -349,14 +323,12 @@ func (k msgServer) AddPauser(goCtx context.Context, msg *types.MsgAddPauser) (*t k.SetPauser(ctx, msg.Pauser) - return &types.MsgAddPauserResponse{}, ctx.EventManager().EmitTypedEvent(&types.PauserAdded{ + return &types.MsgAddPauserResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.PauserAdded{ Address: msg.Pauser, }) } -func (k msgServer) RemovePauser(goCtx context.Context, msg *types.MsgRemovePauser) (*types.MsgRemovePauserResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) RemovePauser(ctx context.Context, msg *types.MsgRemovePauser) (*types.MsgRemovePauserResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -371,14 +343,12 @@ func (k msgServer) RemovePauser(goCtx context.Context, msg *types.MsgRemovePause k.DeletePauser(ctx, msg.Pauser) - return &types.MsgRemovePauserResponse{}, ctx.EventManager().EmitTypedEvent(&types.PauserRemoved{ + return &types.MsgRemovePauserResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.PauserRemoved{ Address: msg.Pauser, }) } -func (k msgServer) AddBlockedChannel(goCtx context.Context, msg *types.MsgAddBlockedChannel) (*types.MsgAddBlockedChannelResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) AddBlockedChannel(ctx context.Context, msg *types.MsgAddBlockedChannel) (*types.MsgAddBlockedChannelResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -393,14 +363,12 @@ func (k msgServer) AddBlockedChannel(goCtx context.Context, msg *types.MsgAddBlo k.SetBlockedChannel(ctx, msg.Channel) - return &types.MsgAddBlockedChannelResponse{}, ctx.EventManager().EmitTypedEvent(&types.BlockedChannelAdded{ + return &types.MsgAddBlockedChannelResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.BlockedChannelAdded{ Channel: msg.Channel, }) } -func (k msgServer) RemoveBlockedChannel(goCtx context.Context, msg *types.MsgRemoveBlockedChannel) (*types.MsgRemoveBlockedChannelResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k msgServer) RemoveBlockedChannel(ctx context.Context, msg *types.MsgRemoveBlockedChannel) (*types.MsgRemoveBlockedChannelResponse, error) { owner := k.GetOwner(ctx) if owner == "" { return nil, types.ErrNoOwner @@ -415,7 +383,7 @@ func (k msgServer) RemoveBlockedChannel(goCtx context.Context, msg *types.MsgRem k.DeleteBlockedChannel(ctx, msg.Channel) - return &types.MsgRemoveBlockedChannelResponse{}, ctx.EventManager().EmitTypedEvent(&types.BlockedChannelRemoved{ + return &types.MsgRemoveBlockedChannelResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &types.BlockedChannelRemoved{ Channel: msg.Channel, }) } diff --git a/x/aura/keeper/msg_server_blocklist.go b/x/aura/keeper/msg_server_blocklist.go index c927f60..f45cff2 100644 --- a/x/aura/keeper/msg_server_blocklist.go +++ b/x/aura/keeper/msg_server_blocklist.go @@ -4,7 +4,6 @@ import ( "context" "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist" ) @@ -18,9 +17,7 @@ func NewBlocklistMsgServer(keeper *Keeper) blocklist.MsgServer { return &blocklistMsgServer{Keeper: keeper} } -func (k blocklistMsgServer) TransferOwnership(goCtx context.Context, msg *blocklist.MsgTransferOwnership) (*blocklist.MsgTransferOwnershipResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k blocklistMsgServer) TransferOwnership(ctx context.Context, msg *blocklist.MsgTransferOwnership) (*blocklist.MsgTransferOwnershipResponse, error) { owner := k.GetBlocklistOwner(ctx) if owner == "" { return nil, blocklist.ErrNoOwner @@ -35,15 +32,13 @@ func (k blocklistMsgServer) TransferOwnership(goCtx context.Context, msg *blockl k.SetBlocklistPendingOwner(ctx, msg.NewOwner) - return &blocklist.MsgTransferOwnershipResponse{}, ctx.EventManager().EmitTypedEvent(&blocklist.OwnershipTransferStarted{ + return &blocklist.MsgTransferOwnershipResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &blocklist.OwnershipTransferStarted{ PreviousOwner: owner, NewOwner: msg.NewOwner, }) } -func (k blocklistMsgServer) AcceptOwnership(goCtx context.Context, msg *blocklist.MsgAcceptOwnership) (*blocklist.MsgAcceptOwnershipResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k blocklistMsgServer) AcceptOwnership(ctx context.Context, msg *blocklist.MsgAcceptOwnership) (*blocklist.MsgAcceptOwnershipResponse, error) { pendingOwner := k.GetBlocklistPendingOwner(ctx) if pendingOwner == "" { return nil, blocklist.ErrNoPendingOwner @@ -56,15 +51,13 @@ func (k blocklistMsgServer) AcceptOwnership(goCtx context.Context, msg *blocklis k.SetBlocklistOwner(ctx, msg.Signer) k.DeleteBlocklistPendingOwner(ctx) - return &blocklist.MsgAcceptOwnershipResponse{}, ctx.EventManager().EmitTypedEvent(&blocklist.OwnershipTransferred{ + return &blocklist.MsgAcceptOwnershipResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &blocklist.OwnershipTransferred{ PreviousOwner: owner, NewOwner: msg.Signer, }) } -func (k blocklistMsgServer) AddToBlocklist(goCtx context.Context, msg *blocklist.MsgAddToBlocklist) (*blocklist.MsgAddToBlocklistResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k blocklistMsgServer) AddToBlocklist(ctx context.Context, msg *blocklist.MsgAddToBlocklist) (*blocklist.MsgAddToBlocklistResponse, error) { owner := k.GetBlocklistOwner(ctx) if owner == "" { return nil, blocklist.ErrNoOwner @@ -74,7 +67,7 @@ func (k blocklistMsgServer) AddToBlocklist(goCtx context.Context, msg *blocklist } for _, account := range msg.Accounts { - address, err := sdk.AccAddressFromBech32(account) + address, err := k.addressCodec.StringToBytes(account) if err != nil { return nil, errors.Wrapf(err, "unable to decode account address %s", account) } @@ -82,14 +75,12 @@ func (k blocklistMsgServer) AddToBlocklist(goCtx context.Context, msg *blocklist k.SetBlockedAddress(ctx, address) } - return &blocklist.MsgAddToBlocklistResponse{}, ctx.EventManager().EmitTypedEvent(&blocklist.BlockedAddressesAdded{ + return &blocklist.MsgAddToBlocklistResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &blocklist.BlockedAddressesAdded{ Accounts: msg.Accounts, }) } -func (k blocklistMsgServer) RemoveFromBlocklist(goCtx context.Context, msg *blocklist.MsgRemoveFromBlocklist) (*blocklist.MsgRemoveFromBlocklistResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - +func (k blocklistMsgServer) RemoveFromBlocklist(ctx context.Context, msg *blocklist.MsgRemoveFromBlocklist) (*blocklist.MsgRemoveFromBlocklistResponse, error) { owner := k.GetBlocklistOwner(ctx) if owner == "" { return nil, blocklist.ErrNoOwner @@ -99,7 +90,7 @@ func (k blocklistMsgServer) RemoveFromBlocklist(goCtx context.Context, msg *bloc } for _, account := range msg.Accounts { - address, err := sdk.AccAddressFromBech32(account) + address, err := k.addressCodec.StringToBytes(account) if err != nil { return nil, errors.Wrapf(err, "unable to decode account address %s", account) } @@ -107,7 +98,7 @@ func (k blocklistMsgServer) RemoveFromBlocklist(goCtx context.Context, msg *bloc k.DeleteBlockedAddress(ctx, address) } - return &blocklist.MsgRemoveFromBlocklistResponse{}, ctx.EventManager().EmitTypedEvent(&blocklist.BlockedAddressesRemoved{ + return &blocklist.MsgRemoveFromBlocklistResponse{}, k.eventService.EventManager(ctx).Emit(ctx, &blocklist.BlockedAddressesRemoved{ Accounts: msg.Accounts, }) } diff --git a/x/aura/keeper/msg_server_blocklist_test.go b/x/aura/keeper/msg_server_blocklist_test.go index f1baa29..cc66d3f 100644 --- a/x/aura/keeper/msg_server_blocklist_test.go +++ b/x/aura/keeper/msg_server_blocklist_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ondoprotocol/usdy-noble/v2/utils" "github.com/ondoprotocol/usdy-noble/v2/utils/mocks" "github.com/ondoprotocol/usdy-noble/v2/x/aura/keeper" @@ -13,11 +12,10 @@ import ( func TestBlocklistTransferOwnership(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistMsgServer(k) // ACT: Attempt to transfer ownership with no owner set. - _, err := server.TransferOwnership(goCtx, &blocklist.MsgTransferOwnership{}) + _, err := server.TransferOwnership(ctx, &blocklist.MsgTransferOwnership{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no blocklist owner") @@ -26,14 +24,14 @@ func TestBlocklistTransferOwnership(t *testing.T) { k.SetBlocklistOwner(ctx, owner.Address) // ACT: Attempt to transfer ownership with invalid signer. - _, err = server.TransferOwnership(goCtx, &blocklist.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &blocklist.MsgTransferOwnership{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, blocklist.ErrInvalidOwner.Error()) // ACT: Attempt to transfer ownership to same owner. - _, err = server.TransferOwnership(goCtx, &blocklist.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &blocklist.MsgTransferOwnership{ Signer: owner.Address, NewOwner: owner.Address, }) @@ -44,7 +42,7 @@ func TestBlocklistTransferOwnership(t *testing.T) { pendingOwner := utils.TestAccount() // ACT: Attempt to transfer ownership. - _, err = server.TransferOwnership(goCtx, &blocklist.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &blocklist.MsgTransferOwnership{ Signer: owner.Address, NewOwner: pendingOwner.Address, }) @@ -55,11 +53,10 @@ func TestBlocklistTransferOwnership(t *testing.T) { func TestBlocklistAcceptOwnership(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistMsgServer(k) // ACT: Attempt to accept ownership with no pending owner set. - _, err := server.AcceptOwnership(goCtx, &blocklist.MsgAcceptOwnership{}) + _, err := server.AcceptOwnership(ctx, &blocklist.MsgAcceptOwnership{}) // ASSERT: The action should've failed due to no pending owner set. require.ErrorContains(t, err, "there is no pending blocklist owner") @@ -68,14 +65,14 @@ func TestBlocklistAcceptOwnership(t *testing.T) { k.SetBlocklistPendingOwner(ctx, pendingOwner.Address) // ACT: Attempt to accept ownership with invalid signer. - _, err = server.AcceptOwnership(goCtx, &blocklist.MsgAcceptOwnership{ + _, err = server.AcceptOwnership(ctx, &blocklist.MsgAcceptOwnership{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, blocklist.ErrInvalidPendingOwner.Error()) // ACT: Attempt to accept ownership. - _, err = server.AcceptOwnership(goCtx, &blocklist.MsgAcceptOwnership{ + _, err = server.AcceptOwnership(ctx, &blocklist.MsgAcceptOwnership{ Signer: pendingOwner.Address, }) // ASSERT: The action should've succeeded, and updated the owner in state. @@ -86,11 +83,10 @@ func TestBlocklistAcceptOwnership(t *testing.T) { func TestAddToBlocklist(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistMsgServer(k) // ACT: Attempt to add to blocklist with no owner set. - _, err := server.AddToBlocklist(goCtx, &blocklist.MsgAddToBlocklist{}) + _, err := server.AddToBlocklist(ctx, &blocklist.MsgAddToBlocklist{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no blocklist owner") @@ -99,14 +95,14 @@ func TestAddToBlocklist(t *testing.T) { k.SetBlocklistOwner(ctx, owner.Address) // ACT: Attempt to add to blocklist with invalid signer. - _, err = server.AddToBlocklist(goCtx, &blocklist.MsgAddToBlocklist{ + _, err = server.AddToBlocklist(ctx, &blocklist.MsgAddToBlocklist{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, blocklist.ErrInvalidOwner.Error()) // ACT: Attempt to add to blocklist with invalid account address. - _, err = server.AddToBlocklist(goCtx, &blocklist.MsgAddToBlocklist{ + _, err = server.AddToBlocklist(ctx, &blocklist.MsgAddToBlocklist{ Signer: owner.Address, Accounts: []string{"cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn"}, }) @@ -117,7 +113,7 @@ func TestAddToBlocklist(t *testing.T) { user := utils.TestAccount() // ACT: Attempt to add to blocklist. - _, err = server.AddToBlocklist(goCtx, &blocklist.MsgAddToBlocklist{ + _, err = server.AddToBlocklist(ctx, &blocklist.MsgAddToBlocklist{ Signer: owner.Address, Accounts: []string{user.Address}, }) @@ -128,11 +124,10 @@ func TestAddToBlocklist(t *testing.T) { func TestRemoveFromBlocklist(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistMsgServer(k) // ACT: Attempt to remove from blocklist with no owner set. - _, err := server.RemoveFromBlocklist(goCtx, &blocklist.MsgRemoveFromBlocklist{}) + _, err := server.RemoveFromBlocklist(ctx, &blocklist.MsgRemoveFromBlocklist{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no blocklist owner") @@ -141,14 +136,14 @@ func TestRemoveFromBlocklist(t *testing.T) { k.SetBlocklistOwner(ctx, owner.Address) // ACT: Attempt to remove from blocklist with invalid signer. - _, err = server.RemoveFromBlocklist(goCtx, &blocklist.MsgRemoveFromBlocklist{ + _, err = server.RemoveFromBlocklist(ctx, &blocklist.MsgRemoveFromBlocklist{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, blocklist.ErrInvalidOwner.Error()) // ACT: Attempt to remove from blocklist with invalid account address. - _, err = server.RemoveFromBlocklist(goCtx, &blocklist.MsgRemoveFromBlocklist{ + _, err = server.RemoveFromBlocklist(ctx, &blocklist.MsgRemoveFromBlocklist{ Signer: owner.Address, Accounts: []string{"cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn"}, }) @@ -159,7 +154,7 @@ func TestRemoveFromBlocklist(t *testing.T) { user := utils.TestAccount() // ACT: Attempt to remove from blocklist with unblocked account. - _, err = server.RemoveFromBlocklist(goCtx, &blocklist.MsgRemoveFromBlocklist{ + _, err = server.RemoveFromBlocklist(ctx, &blocklist.MsgRemoveFromBlocklist{ Signer: owner.Address, Accounts: []string{user.Address}, }) @@ -172,7 +167,7 @@ func TestRemoveFromBlocklist(t *testing.T) { require.True(t, k.HasBlockedAddress(ctx, user.Bytes)) // ACT: Attempt to remove from blocklist. - _, err = server.RemoveFromBlocklist(goCtx, &blocklist.MsgRemoveFromBlocklist{ + _, err = server.RemoveFromBlocklist(ctx, &blocklist.MsgRemoveFromBlocklist{ Signer: owner.Address, Accounts: []string{user.Address}, }) diff --git a/x/aura/keeper/msg_server_test.go b/x/aura/keeper/msg_server_test.go index c5d7933..85d34c9 100644 --- a/x/aura/keeper/msg_server_test.go +++ b/x/aura/keeper/msg_server_test.go @@ -20,7 +20,6 @@ func TestBurn(t *testing.T) { Restriction: mocks.NoOpSendRestrictionFn, } k, ctx := mocks.AuraKeeperWithBank(bank) - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ARRANGE: Set burner in state, with enough allowance for a single burn. @@ -28,14 +27,14 @@ func TestBurn(t *testing.T) { k.SetBurner(ctx, burner.Address, ONE) // ACT: Attempt to burn with invalid signer. - _, err := server.Burn(goCtx, &types.MsgBurn{ + _, err := server.Burn(ctx, &types.MsgBurn{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, types.ErrInvalidBurner.Error()) // ACT: Attempt to burn with invalid account address. - _, err = server.Burn(goCtx, &types.MsgBurn{ + _, err = server.Burn(ctx, &types.MsgBurn{ Signer: burner.Address, From: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", Amount: ONE, @@ -47,7 +46,7 @@ func TestBurn(t *testing.T) { user := utils.TestAccount() // ACT: Attempt to burn invalid amount. - _, err = server.Burn(goCtx, &types.MsgBurn{ + _, err = server.Burn(ctx, &types.MsgBurn{ Signer: burner.Address, From: user.Address, Amount: ONE.Neg(), @@ -56,7 +55,7 @@ func TestBurn(t *testing.T) { require.ErrorContains(t, err, "amount must be positive") // ACT: Attempt to burn from user with insufficient funds. - _, err = server.Burn(goCtx, &types.MsgBurn{ + _, err = server.Burn(ctx, &types.MsgBurn{ Signer: burner.Address, From: user.Address, Amount: ONE, @@ -68,7 +67,7 @@ func TestBurn(t *testing.T) { bank.Balances[user.Address] = sdk.NewCoins(sdk.NewCoin(k.Denom, ONE)) // ACT: Attempt to burn. - _, err = server.Burn(goCtx, &types.MsgBurn{ + _, err = server.Burn(ctx, &types.MsgBurn{ Signer: burner.Address, From: user.Address, Amount: ONE, @@ -80,7 +79,7 @@ func TestBurn(t *testing.T) { require.True(t, k.GetBurner(ctx, burner.Address).IsZero()) // ACT: Attempt another burn with insufficient allowance. - _, err = server.Burn(goCtx, &types.MsgBurn{ + _, err = server.Burn(ctx, &types.MsgBurn{ Signer: burner.Address, From: user.Address, Amount: ONE, @@ -95,7 +94,6 @@ func TestMint(t *testing.T) { Restriction: mocks.NoOpSendRestrictionFn, } k, ctx := mocks.AuraKeeperWithBank(bank) - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ARRANGE: Set minter in state, with enough allowance for a single mint. @@ -103,14 +101,14 @@ func TestMint(t *testing.T) { k.SetMinter(ctx, minter.Address, ONE) // ACT: Attempt to mint with invalid signer. - _, err := server.Mint(goCtx, &types.MsgMint{ + _, err := server.Mint(ctx, &types.MsgMint{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, types.ErrInvalidMinter.Error()) // ACT: Attempt to mint with invalid account address. - _, err = server.Mint(goCtx, &types.MsgMint{ + _, err = server.Mint(ctx, &types.MsgMint{ Signer: minter.Address, To: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", Amount: ONE, @@ -123,7 +121,7 @@ func TestMint(t *testing.T) { k.SetBlockedAddress(ctx, user.Bytes) // ACT: Attempt to mint to blocked address. - _, err = server.Mint(goCtx, &types.MsgMint{ + _, err = server.Mint(ctx, &types.MsgMint{ Signer: minter.Address, To: user.Address, Amount: ONE, @@ -135,7 +133,7 @@ func TestMint(t *testing.T) { k.DeleteBlockedAddress(ctx, user.Bytes) // ACT: Attempt to mint invalid amount. - _, err = server.Mint(goCtx, &types.MsgMint{ + _, err = server.Mint(ctx, &types.MsgMint{ Signer: minter.Address, To: user.Address, Amount: ONE.Neg(), @@ -144,7 +142,7 @@ func TestMint(t *testing.T) { require.ErrorContains(t, err, "amount must be positive") // ACT: Attempt to mint. - _, err = server.Mint(goCtx, &types.MsgMint{ + _, err = server.Mint(ctx, &types.MsgMint{ Signer: minter.Address, To: user.Address, Amount: ONE, @@ -156,7 +154,7 @@ func TestMint(t *testing.T) { require.True(t, k.GetMinter(ctx, minter.Address).IsZero()) // ACT: Attempt another mint with insufficient allowance. - _, err = server.Mint(goCtx, &types.MsgMint{ + _, err = server.Mint(ctx, &types.MsgMint{ Signer: minter.Address, To: user.Address, Amount: ONE, @@ -167,7 +165,6 @@ func TestMint(t *testing.T) { func TestPause(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ARRANGE: Set pauser in state. @@ -175,7 +172,7 @@ func TestPause(t *testing.T) { k.SetPauser(ctx, pauser.Address) // ACT: Attempt to pause with invalid signer. - _, err := server.Pause(goCtx, &types.MsgPause{ + _, err := server.Pause(ctx, &types.MsgPause{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -183,7 +180,7 @@ func TestPause(t *testing.T) { require.False(t, k.GetPaused(ctx)) // ACT: Attempt to pause. - _, err = server.Pause(goCtx, &types.MsgPause{ + _, err = server.Pause(ctx, &types.MsgPause{ Signer: pauser.Address, }) // ASSERT: The action should've succeeded. @@ -191,7 +188,7 @@ func TestPause(t *testing.T) { require.True(t, k.GetPaused(ctx)) // ACT: Attempt to pause again. - _, err = server.Pause(goCtx, &types.MsgPause{ + _, err = server.Pause(ctx, &types.MsgPause{ Signer: pauser.Address, }) // ASSERT: The action should've failed due to module being paused already. @@ -201,14 +198,13 @@ func TestPause(t *testing.T) { func TestUnpause(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ARRANGE: Set paused state to true. k.SetPaused(ctx, true) // ACT: Attempt to unpause with no owner set. - _, err := server.Unpause(goCtx, &types.MsgUnpause{}) + _, err := server.Unpause(ctx, &types.MsgUnpause{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") require.True(t, k.GetPaused(ctx)) @@ -218,7 +214,7 @@ func TestUnpause(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to unpause with invalid signer. - _, err = server.Unpause(goCtx, &types.MsgUnpause{ + _, err = server.Unpause(ctx, &types.MsgUnpause{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -226,7 +222,7 @@ func TestUnpause(t *testing.T) { require.True(t, k.GetPaused(ctx)) // ACT: Attempt to unpause. - _, err = server.Unpause(goCtx, &types.MsgUnpause{ + _, err = server.Unpause(ctx, &types.MsgUnpause{ Signer: owner.Address, }) // ASSERT: The action should've succeeded. @@ -234,7 +230,7 @@ func TestUnpause(t *testing.T) { require.False(t, k.GetPaused(ctx)) // ACT: Attempt to unpause again. - _, err = server.Unpause(goCtx, &types.MsgUnpause{ + _, err = server.Unpause(ctx, &types.MsgUnpause{ Signer: owner.Address, }) // ASSERT: The action should've failed due to module being unpaused already. @@ -244,11 +240,10 @@ func TestUnpause(t *testing.T) { func TestTransferOwnership(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to transfer ownership with no owner set. - _, err := server.TransferOwnership(goCtx, &types.MsgTransferOwnership{}) + _, err := server.TransferOwnership(ctx, &types.MsgTransferOwnership{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -257,14 +252,14 @@ func TestTransferOwnership(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to transfer ownership with invalid signer. - _, err = server.TransferOwnership(goCtx, &types.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &types.MsgTransferOwnership{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, types.ErrInvalidOwner.Error()) // ACT: Attempt to transfer ownership to same owner. - _, err = server.TransferOwnership(goCtx, &types.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &types.MsgTransferOwnership{ Signer: owner.Address, NewOwner: owner.Address, }) @@ -275,7 +270,7 @@ func TestTransferOwnership(t *testing.T) { pendingOwner := utils.TestAccount() // ACT: Attempt to transfer ownership. - _, err = server.TransferOwnership(goCtx, &types.MsgTransferOwnership{ + _, err = server.TransferOwnership(ctx, &types.MsgTransferOwnership{ Signer: owner.Address, NewOwner: pendingOwner.Address, }) @@ -286,11 +281,10 @@ func TestTransferOwnership(t *testing.T) { func TestAcceptOwnership(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to accept ownership with no pending owner set. - _, err := server.AcceptOwnership(goCtx, &types.MsgAcceptOwnership{}) + _, err := server.AcceptOwnership(ctx, &types.MsgAcceptOwnership{}) // ASSERT: The action should've failed due to no pending owner set. require.ErrorContains(t, err, "there is no pending owner") @@ -299,14 +293,14 @@ func TestAcceptOwnership(t *testing.T) { k.SetPendingOwner(ctx, pendingOwner.Address) // ACT: Attempt to accept ownership with invalid signer. - _, err = server.AcceptOwnership(goCtx, &types.MsgAcceptOwnership{ + _, err = server.AcceptOwnership(ctx, &types.MsgAcceptOwnership{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. require.ErrorContains(t, err, types.ErrInvalidPendingOwner.Error()) // ACT: Attempt to accept ownership. - _, err = server.AcceptOwnership(goCtx, &types.MsgAcceptOwnership{ + _, err = server.AcceptOwnership(ctx, &types.MsgAcceptOwnership{ Signer: pendingOwner.Address, }) // ASSERT: The action should've succeeded, and updated the owner in state. @@ -317,11 +311,10 @@ func TestAcceptOwnership(t *testing.T) { func TestAddBurner(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to add burner with no owner set. - _, err := server.AddBurner(goCtx, &types.MsgAddBurner{}) + _, err := server.AddBurner(ctx, &types.MsgAddBurner{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -330,7 +323,7 @@ func TestAddBurner(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to add burner with invalid signer. - _, err = server.AddBurner(goCtx, &types.MsgAddBurner{ + _, err = server.AddBurner(ctx, &types.MsgAddBurner{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -341,7 +334,7 @@ func TestAddBurner(t *testing.T) { k.SetBurner(ctx, burner2.Address, ONE) // ACT: Attempt to add burner that already exists. - _, err = server.AddBurner(goCtx, &types.MsgAddBurner{ + _, err = server.AddBurner(ctx, &types.MsgAddBurner{ Signer: owner.Address, Burner: burner2.Address, Allowance: ONE, @@ -350,7 +343,7 @@ func TestAddBurner(t *testing.T) { require.ErrorContains(t, err, "is already a burner") // ACT: Attempt to add burner with invalid allowance. - _, err = server.AddBurner(goCtx, &types.MsgAddBurner{ + _, err = server.AddBurner(ctx, &types.MsgAddBurner{ Signer: owner.Address, Burner: burner1.Address, Allowance: ONE.Neg(), @@ -359,7 +352,7 @@ func TestAddBurner(t *testing.T) { require.ErrorContains(t, err, "allowance cannot be negative") // ACT: Attempt to add burner. - _, err = server.AddBurner(goCtx, &types.MsgAddBurner{ + _, err = server.AddBurner(ctx, &types.MsgAddBurner{ Signer: owner.Address, Burner: burner1.Address, Allowance: ONE, @@ -371,11 +364,10 @@ func TestAddBurner(t *testing.T) { func TestRemoveBurner(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to remove burner with no owner set. - _, err := server.RemoveBurner(goCtx, &types.MsgRemoveBurner{}) + _, err := server.RemoveBurner(ctx, &types.MsgRemoveBurner{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -384,7 +376,7 @@ func TestRemoveBurner(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to remove burner with invalid signer. - _, err = server.RemoveBurner(goCtx, &types.MsgRemoveBurner{ + _, err = server.RemoveBurner(ctx, &types.MsgRemoveBurner{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -394,7 +386,7 @@ func TestRemoveBurner(t *testing.T) { burner := utils.TestAccount() // ACT: Attempt to remove burner that does not exist. - _, err = server.RemoveBurner(goCtx, &types.MsgRemoveBurner{ + _, err = server.RemoveBurner(ctx, &types.MsgRemoveBurner{ Signer: owner.Address, Burner: burner.Address, }) @@ -405,7 +397,7 @@ func TestRemoveBurner(t *testing.T) { k.SetBurner(ctx, burner.Address, ONE) // ACT: Attempt to remove burner. - _, err = server.RemoveBurner(goCtx, &types.MsgRemoveBurner{ + _, err = server.RemoveBurner(ctx, &types.MsgRemoveBurner{ Signer: owner.Address, Burner: burner.Address, }) @@ -416,11 +408,10 @@ func TestRemoveBurner(t *testing.T) { func TestSetBurnerAllowance(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to set burner allowance with no owner set. - _, err := server.SetBurnerAllowance(goCtx, &types.MsgSetBurnerAllowance{}) + _, err := server.SetBurnerAllowance(ctx, &types.MsgSetBurnerAllowance{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -429,7 +420,7 @@ func TestSetBurnerAllowance(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to set burner allowance with invalid signer. - _, err = server.SetBurnerAllowance(goCtx, &types.MsgSetBurnerAllowance{ + _, err = server.SetBurnerAllowance(ctx, &types.MsgSetBurnerAllowance{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -439,7 +430,7 @@ func TestSetBurnerAllowance(t *testing.T) { burner := utils.TestAccount() // ACT: Attempt to set burner allowance that does not exist. - _, err = server.SetBurnerAllowance(goCtx, &types.MsgSetBurnerAllowance{ + _, err = server.SetBurnerAllowance(ctx, &types.MsgSetBurnerAllowance{ Signer: owner.Address, Burner: burner.Address, Allowance: ONE, @@ -451,7 +442,7 @@ func TestSetBurnerAllowance(t *testing.T) { k.SetBurner(ctx, burner.Address, math.ZeroInt()) // ACT: Attempt to set burner allowance with invalid allowance. - _, err = server.SetBurnerAllowance(goCtx, &types.MsgSetBurnerAllowance{ + _, err = server.SetBurnerAllowance(ctx, &types.MsgSetBurnerAllowance{ Signer: owner.Address, Burner: burner.Address, Allowance: ONE.Neg(), @@ -460,7 +451,7 @@ func TestSetBurnerAllowance(t *testing.T) { require.ErrorContains(t, err, "allowance cannot be negative") // ACT: Attempt to set burner allowance. - _, err = server.SetBurnerAllowance(goCtx, &types.MsgSetBurnerAllowance{ + _, err = server.SetBurnerAllowance(ctx, &types.MsgSetBurnerAllowance{ Signer: owner.Address, Burner: burner.Address, Allowance: ONE, @@ -472,11 +463,10 @@ func TestSetBurnerAllowance(t *testing.T) { func TestAddMinter(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to add minter with no owner set. - _, err := server.AddMinter(goCtx, &types.MsgAddMinter{}) + _, err := server.AddMinter(ctx, &types.MsgAddMinter{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -485,7 +475,7 @@ func TestAddMinter(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to add minter with invalid signer. - _, err = server.AddMinter(goCtx, &types.MsgAddMinter{ + _, err = server.AddMinter(ctx, &types.MsgAddMinter{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -496,7 +486,7 @@ func TestAddMinter(t *testing.T) { k.SetMinter(ctx, minter2.Address, ONE) // ACT: Attempt to add minter that already exists. - _, err = server.AddMinter(goCtx, &types.MsgAddMinter{ + _, err = server.AddMinter(ctx, &types.MsgAddMinter{ Signer: owner.Address, Minter: minter2.Address, Allowance: ONE, @@ -505,7 +495,7 @@ func TestAddMinter(t *testing.T) { require.ErrorContains(t, err, "is already a minter") // ACT: Attempt to add minter with invalid allowance. - _, err = server.AddMinter(goCtx, &types.MsgAddMinter{ + _, err = server.AddMinter(ctx, &types.MsgAddMinter{ Signer: owner.Address, Minter: minter1.Address, Allowance: ONE.Neg(), @@ -514,7 +504,7 @@ func TestAddMinter(t *testing.T) { require.ErrorContains(t, err, "allowance cannot be negative") // ACT: Attempt to add minter. - _, err = server.AddMinter(goCtx, &types.MsgAddMinter{ + _, err = server.AddMinter(ctx, &types.MsgAddMinter{ Signer: owner.Address, Minter: minter1.Address, Allowance: ONE, @@ -526,11 +516,10 @@ func TestAddMinter(t *testing.T) { func TestRemoveMinter(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to remove minter with no owner set. - _, err := server.RemoveMinter(goCtx, &types.MsgRemoveMinter{}) + _, err := server.RemoveMinter(ctx, &types.MsgRemoveMinter{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -539,7 +528,7 @@ func TestRemoveMinter(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to remove minter with invalid signer. - _, err = server.RemoveMinter(goCtx, &types.MsgRemoveMinter{ + _, err = server.RemoveMinter(ctx, &types.MsgRemoveMinter{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -549,7 +538,7 @@ func TestRemoveMinter(t *testing.T) { minter := utils.TestAccount() // ACT: Attempt to remove minter that does not exist. - _, err = server.RemoveMinter(goCtx, &types.MsgRemoveMinter{ + _, err = server.RemoveMinter(ctx, &types.MsgRemoveMinter{ Signer: owner.Address, Minter: minter.Address, }) @@ -560,7 +549,7 @@ func TestRemoveMinter(t *testing.T) { k.SetMinter(ctx, minter.Address, ONE) // ACT: Attempt to remove minter. - _, err = server.RemoveMinter(goCtx, &types.MsgRemoveMinter{ + _, err = server.RemoveMinter(ctx, &types.MsgRemoveMinter{ Signer: owner.Address, Minter: minter.Address, }) @@ -571,11 +560,10 @@ func TestRemoveMinter(t *testing.T) { func TestSetMinterAllowance(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to set minter allowance with no owner set. - _, err := server.SetMinterAllowance(goCtx, &types.MsgSetMinterAllowance{}) + _, err := server.SetMinterAllowance(ctx, &types.MsgSetMinterAllowance{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -584,7 +572,7 @@ func TestSetMinterAllowance(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to set minter allowance with invalid signer. - _, err = server.SetMinterAllowance(goCtx, &types.MsgSetMinterAllowance{ + _, err = server.SetMinterAllowance(ctx, &types.MsgSetMinterAllowance{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -594,7 +582,7 @@ func TestSetMinterAllowance(t *testing.T) { minter := utils.TestAccount() // ACT: Attempt to set minter allowance that does not exist. - _, err = server.SetMinterAllowance(goCtx, &types.MsgSetMinterAllowance{ + _, err = server.SetMinterAllowance(ctx, &types.MsgSetMinterAllowance{ Signer: owner.Address, Minter: minter.Address, Allowance: ONE, @@ -606,7 +594,7 @@ func TestSetMinterAllowance(t *testing.T) { k.SetMinter(ctx, minter.Address, math.ZeroInt()) // ACT: Attempt to set minter allowance with invalid allowance. - _, err = server.SetMinterAllowance(goCtx, &types.MsgSetMinterAllowance{ + _, err = server.SetMinterAllowance(ctx, &types.MsgSetMinterAllowance{ Signer: owner.Address, Minter: minter.Address, Allowance: ONE.Neg(), @@ -615,7 +603,7 @@ func TestSetMinterAllowance(t *testing.T) { require.ErrorContains(t, err, "allowance cannot be negative") // ACT: Attempt to set minter allowance. - _, err = server.SetMinterAllowance(goCtx, &types.MsgSetMinterAllowance{ + _, err = server.SetMinterAllowance(ctx, &types.MsgSetMinterAllowance{ Signer: owner.Address, Minter: minter.Address, Allowance: ONE, @@ -627,11 +615,10 @@ func TestSetMinterAllowance(t *testing.T) { func TestAddPauser(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to add pauser with no owner set. - _, err := server.AddPauser(goCtx, &types.MsgAddPauser{}) + _, err := server.AddPauser(ctx, &types.MsgAddPauser{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -640,7 +627,7 @@ func TestAddPauser(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to add pauser with invalid signer. - _, err = server.AddPauser(goCtx, &types.MsgAddPauser{ + _, err = server.AddPauser(ctx, &types.MsgAddPauser{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -651,7 +638,7 @@ func TestAddPauser(t *testing.T) { k.SetPauser(ctx, pauser2.Address) // ACT: Attempt to add pauser that already exists. - _, err = server.AddPauser(goCtx, &types.MsgAddPauser{ + _, err = server.AddPauser(ctx, &types.MsgAddPauser{ Signer: owner.Address, Pauser: pauser2.Address, }) @@ -659,7 +646,7 @@ func TestAddPauser(t *testing.T) { require.ErrorContains(t, err, "is already a pauser") // ACT: Attempt to add pauser. - _, err = server.AddPauser(goCtx, &types.MsgAddPauser{ + _, err = server.AddPauser(ctx, &types.MsgAddPauser{ Signer: owner.Address, Pauser: pauser1.Address, }) @@ -670,11 +657,10 @@ func TestAddPauser(t *testing.T) { func TestRemovePauser(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to remove pauser with no owner set. - _, err := server.RemovePauser(goCtx, &types.MsgRemovePauser{}) + _, err := server.RemovePauser(ctx, &types.MsgRemovePauser{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -683,7 +669,7 @@ func TestRemovePauser(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to remove pauser with invalid signer. - _, err = server.RemovePauser(goCtx, &types.MsgRemovePauser{ + _, err = server.RemovePauser(ctx, &types.MsgRemovePauser{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -693,7 +679,7 @@ func TestRemovePauser(t *testing.T) { pauser := utils.TestAccount() // ACT: Attempt to remove pauser that does not exist. - _, err = server.RemovePauser(goCtx, &types.MsgRemovePauser{ + _, err = server.RemovePauser(ctx, &types.MsgRemovePauser{ Signer: owner.Address, Pauser: pauser.Address, }) @@ -704,7 +690,7 @@ func TestRemovePauser(t *testing.T) { k.SetPauser(ctx, pauser.Address) // ACT: Attempt to remove pauser. - _, err = server.RemovePauser(goCtx, &types.MsgRemovePauser{ + _, err = server.RemovePauser(ctx, &types.MsgRemovePauser{ Signer: owner.Address, Pauser: pauser.Address, }) @@ -715,11 +701,10 @@ func TestRemovePauser(t *testing.T) { func TestAddBlockedChannel(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to add blocked channel with no owner set. - _, err := server.AddBlockedChannel(goCtx, &types.MsgAddBlockedChannel{}) + _, err := server.AddBlockedChannel(ctx, &types.MsgAddBlockedChannel{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -728,7 +713,7 @@ func TestAddBlockedChannel(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to add blocked channel with invalid signer. - _, err = server.AddBlockedChannel(goCtx, &types.MsgAddBlockedChannel{ + _, err = server.AddBlockedChannel(ctx, &types.MsgAddBlockedChannel{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -739,7 +724,7 @@ func TestAddBlockedChannel(t *testing.T) { k.SetBlockedChannel(ctx, channel2) // ACT: Attempt to add blocked channel that is blocked. - _, err = server.AddBlockedChannel(goCtx, &types.MsgAddBlockedChannel{ + _, err = server.AddBlockedChannel(ctx, &types.MsgAddBlockedChannel{ Signer: owner.Address, Channel: channel2, }) @@ -747,7 +732,7 @@ func TestAddBlockedChannel(t *testing.T) { require.ErrorContains(t, err, "is already blocked") // ACT: Attempt to add blocked channel. - _, err = server.AddBlockedChannel(goCtx, &types.MsgAddBlockedChannel{ + _, err = server.AddBlockedChannel(ctx, &types.MsgAddBlockedChannel{ Signer: owner.Address, Channel: channel1, }) @@ -758,11 +743,10 @@ func TestAddBlockedChannel(t *testing.T) { func TestRemoveBlockedChannel(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewMsgServer(k) // ACT: Attempt to remove blocked channel with no owner set. - _, err := server.RemoveBlockedChannel(goCtx, &types.MsgRemoveBlockedChannel{}) + _, err := server.RemoveBlockedChannel(ctx, &types.MsgRemoveBlockedChannel{}) // ASSERT: The action should've failed due to no owner set. require.ErrorContains(t, err, "there is no owner") @@ -771,7 +755,7 @@ func TestRemoveBlockedChannel(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to remove blocked channel with invalid signer. - _, err = server.RemoveBlockedChannel(goCtx, &types.MsgRemoveBlockedChannel{ + _, err = server.RemoveBlockedChannel(ctx, &types.MsgRemoveBlockedChannel{ Signer: utils.TestAccount().Address, }) // ASSERT: The action should've failed due to invalid signer. @@ -781,7 +765,7 @@ func TestRemoveBlockedChannel(t *testing.T) { channel := "channel-0" // ACT: Attempt to remove blocked channel that isn't blocked. - _, err = server.RemoveBlockedChannel(goCtx, &types.MsgRemoveBlockedChannel{ + _, err = server.RemoveBlockedChannel(ctx, &types.MsgRemoveBlockedChannel{ Signer: owner.Address, Channel: channel, }) @@ -792,7 +776,7 @@ func TestRemoveBlockedChannel(t *testing.T) { k.SetBlockedChannel(ctx, channel) // ACT: Attempt to remove blocked channel. - _, err = server.RemoveBlockedChannel(goCtx, &types.MsgRemoveBlockedChannel{ + _, err = server.RemoveBlockedChannel(ctx, &types.MsgRemoveBlockedChannel{ Signer: owner.Address, Channel: channel, }) diff --git a/x/aura/keeper/query_server.go b/x/aura/keeper/query_server.go index 4261738..957701b 100644 --- a/x/aura/keeper/query_server.go +++ b/x/aura/keeper/query_server.go @@ -3,7 +3,6 @@ package keeper import ( "context" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ondoprotocol/usdy-noble/v2/x/aura/types" ) @@ -26,65 +25,53 @@ func (k queryServer) Denom(_ context.Context, req *types.QueryDenom) (*types.Que return &types.QueryDenomResponse{Denom: k.Keeper.Denom}, nil } -func (k queryServer) Paused(goCtx context.Context, req *types.QueryPaused) (*types.QueryPausedResponse, error) { +func (k queryServer) Paused(ctx context.Context, req *types.QueryPaused) (*types.QueryPausedResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryPausedResponse{Paused: k.GetPaused(ctx)}, nil } -func (k queryServer) Owner(goCtx context.Context, req *types.QueryOwner) (*types.QueryOwnerResponse, error) { +func (k queryServer) Owner(ctx context.Context, req *types.QueryOwner) (*types.QueryOwnerResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryOwnerResponse{ Owner: k.GetOwner(ctx), PendingOwner: k.GetPendingOwner(ctx), }, nil } -func (k queryServer) Burners(goCtx context.Context, req *types.QueryBurners) (*types.QueryBurnersResponse, error) { +func (k queryServer) Burners(ctx context.Context, req *types.QueryBurners) (*types.QueryBurnersResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryBurnersResponse{Burners: k.GetBurners(ctx)}, nil } -func (k queryServer) Minters(goCtx context.Context, req *types.QueryMinters) (*types.QueryMintersResponse, error) { +func (k queryServer) Minters(ctx context.Context, req *types.QueryMinters) (*types.QueryMintersResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryMintersResponse{Minters: k.GetMinters(ctx)}, nil } -func (k queryServer) Pausers(goCtx context.Context, req *types.QueryPausers) (*types.QueryPausersResponse, error) { +func (k queryServer) Pausers(ctx context.Context, req *types.QueryPausers) (*types.QueryPausersResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryPausersResponse{Pausers: k.GetPausers(ctx)}, nil } -func (k queryServer) BlockedChannels(goCtx context.Context, req *types.QueryBlockedChannels) (*types.QueryBlockedChannelsResponse, error) { +func (k queryServer) BlockedChannels(ctx context.Context, req *types.QueryBlockedChannels) (*types.QueryBlockedChannelsResponse, error) { if req == nil { return nil, errors.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &types.QueryBlockedChannelsResponse{BlockedChannels: k.GetBlockedChannels(ctx)}, nil } diff --git a/x/aura/keeper/query_server_blocklist.go b/x/aura/keeper/query_server_blocklist.go index 0697790..d1d9026 100644 --- a/x/aura/keeper/query_server_blocklist.go +++ b/x/aura/keeper/query_server_blocklist.go @@ -22,25 +22,22 @@ func NewBlocklistQueryServer(keeper *Keeper) blocklist.QueryServer { return &blocklistQueryServer{Keeper: keeper} } -func (k blocklistQueryServer) Owner(goCtx context.Context, req *blocklist.QueryOwner) (*blocklist.QueryOwnerResponse, error) { +func (k blocklistQueryServer) Owner(ctx context.Context, req *blocklist.QueryOwner) (*blocklist.QueryOwnerResponse, error) { if req == nil { return nil, errorstypes.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - return &blocklist.QueryOwnerResponse{ Owner: k.GetBlocklistOwner(ctx), PendingOwner: k.GetBlocklistPendingOwner(ctx), }, nil } -func (k blocklistQueryServer) Addresses(goCtx context.Context, req *blocklist.QueryAddresses) (*blocklist.QueryAddressesResponse, error) { +func (k blocklistQueryServer) Addresses(ctx context.Context, req *blocklist.QueryAddresses) (*blocklist.QueryAddressesResponse, error) { if req == nil { return nil, errorstypes.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) adapter := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)) store := prefix.NewStore(adapter, blocklist.BlockedAddressPrefix) @@ -56,14 +53,12 @@ func (k blocklistQueryServer) Addresses(goCtx context.Context, req *blocklist.Qu }, err } -func (k blocklistQueryServer) Address(goCtx context.Context, req *blocklist.QueryAddress) (*blocklist.QueryAddressResponse, error) { +func (k blocklistQueryServer) Address(ctx context.Context, req *blocklist.QueryAddress) (*blocklist.QueryAddressResponse, error) { if req == nil { return nil, errorstypes.ErrInvalidRequest } - ctx := sdk.UnwrapSDKContext(goCtx) - - address, err := sdk.AccAddressFromBech32(req.Address) + address, err := k.addressCodec.StringToBytes(req.Address) if err != nil { return nil, errors.Wrapf(err, "unable to decode address %s", req.Address) } diff --git a/x/aura/keeper/query_server_blocklist_test.go b/x/aura/keeper/query_server_blocklist_test.go index 451d799..7cd64cb 100644 --- a/x/aura/keeper/query_server_blocklist_test.go +++ b/x/aura/keeper/query_server_blocklist_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ondoprotocol/usdy-noble/v2/utils" "github.com/ondoprotocol/usdy-noble/v2/utils/mocks" @@ -14,11 +13,10 @@ import ( func TestBlocklistOwnerQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistQueryServer(k) // ACT: Attempt to query blocklist owner with invalid request. - _, err := server.Owner(goCtx, nil) + _, err := server.Owner(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) @@ -27,7 +25,7 @@ func TestBlocklistOwnerQuery(t *testing.T) { k.SetBlocklistOwner(ctx, owner.Address) // ACT: Attempt to query blocklist owner with state. - res, err := server.Owner(goCtx, &blocklist.QueryOwner{}) + res, err := server.Owner(ctx, &blocklist.QueryOwner{}) // ASSERT: The query should've succeeded, with empty pending owner. require.NoError(t, err) require.Equal(t, owner.Address, res.Owner) @@ -38,7 +36,7 @@ func TestBlocklistOwnerQuery(t *testing.T) { k.SetBlocklistPendingOwner(ctx, pendingOwner.Address) // ACT: Attempt to query blocklist owner with state. - res, err = server.Owner(goCtx, &blocklist.QueryOwner{}) + res, err = server.Owner(ctx, &blocklist.QueryOwner{}) // ASSERT: The query should've succeeded, with pending owner. require.NoError(t, err) require.Equal(t, owner.Address, res.Owner) @@ -49,16 +47,15 @@ func TestBlocklistAddressesQuery(t *testing.T) { // NOTE: Query pagination is assumed working, so isn't testing here. k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistQueryServer(k) // ACT: Attempt to query blocklist addresses with invalid request. - _, err := server.Addresses(goCtx, nil) + _, err := server.Addresses(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query blocklist addresses with no state. - res, err := server.Addresses(goCtx, &blocklist.QueryAddresses{}) + res, err := server.Addresses(ctx, &blocklist.QueryAddresses{}) // ASSERT: The query should've succeeded, with empty addresses. require.NoError(t, err) require.Empty(t, res.Addresses) @@ -69,7 +66,7 @@ func TestBlocklistAddressesQuery(t *testing.T) { k.SetBlockedAddress(ctx, user2.Bytes) // ACT: Attempt to query blocklist addresses with state. - res, err = server.Addresses(goCtx, &blocklist.QueryAddresses{}) + res, err = server.Addresses(ctx, &blocklist.QueryAddresses{}) // ASSERT: The query should've succeeded, with addresses. require.NoError(t, err) require.Len(t, res.Addresses, 2) @@ -79,23 +76,22 @@ func TestBlocklistAddressesQuery(t *testing.T) { func TestBlocklistAddressQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewBlocklistQueryServer(k) // ACT: Attempt to query blocked state with invalid request. - _, err := server.Address(goCtx, nil) + _, err := server.Address(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query blocked state with invalid address. - _, err = server.Address(goCtx, &blocklist.QueryAddress{ + _, err = server.Address(ctx, &blocklist.QueryAddress{ Address: "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", }) // ASSERT: The query should've failed due to invalid address. require.ErrorContains(t, err, "unable to decode address") // ACT: Attempt to query blocked state of unblocked address. - res, err := server.Address(goCtx, &blocklist.QueryAddress{ + res, err := server.Address(ctx, &blocklist.QueryAddress{ Address: utils.TestAccount().Address, }) // ASSERT: The query should've succeeded. @@ -107,7 +103,7 @@ func TestBlocklistAddressQuery(t *testing.T) { k.SetBlockedAddress(ctx, user.Bytes) // ACT: Attempt to query blocked state of blocked address. - res, err = server.Address(goCtx, &blocklist.QueryAddress{ + res, err = server.Address(ctx, &blocklist.QueryAddress{ Address: user.Address, }) // ASSERT: The query should've succeeded. diff --git a/x/aura/keeper/query_server_test.go b/x/aura/keeper/query_server_test.go index 0a4bb1c..c028f51 100644 --- a/x/aura/keeper/query_server_test.go +++ b/x/aura/keeper/query_server_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "testing" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ondoprotocol/usdy-noble/v2/utils" "github.com/ondoprotocol/usdy-noble/v2/utils/mocks" @@ -14,16 +13,15 @@ import ( func TestDenomQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query denom with invalid request. - _, err := server.Denom(goCtx, nil) + _, err := server.Denom(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query denom. - res, err := server.Denom(goCtx, &types.QueryDenom{}) + res, err := server.Denom(ctx, &types.QueryDenom{}) // ASSERT: The query should've succeeded. require.NoError(t, err) require.Equal(t, "ausdy", res.Denom) @@ -31,16 +29,15 @@ func TestDenomQuery(t *testing.T) { func TestPausedQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query paused state with invalid request. - _, err := server.Paused(goCtx, nil) + _, err := server.Paused(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query paused state with no state. - res, err := server.Paused(goCtx, &types.QueryPaused{}) + res, err := server.Paused(ctx, &types.QueryPaused{}) // ASSERT: The query should've succeeded, and returned false. require.NoError(t, err) require.False(t, res.Paused) @@ -49,7 +46,7 @@ func TestPausedQuery(t *testing.T) { k.SetPaused(ctx, true) // ACT: Attempt to query paused state with state. - res, err = server.Paused(goCtx, &types.QueryPaused{}) + res, err = server.Paused(ctx, &types.QueryPaused{}) // ASSERT: The query should've succeeded, and returned true. require.NoError(t, err) require.True(t, res.Paused) @@ -57,11 +54,10 @@ func TestPausedQuery(t *testing.T) { func TestOwnerQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query owner with invalid request. - _, err := server.Owner(goCtx, nil) + _, err := server.Owner(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) @@ -70,7 +66,7 @@ func TestOwnerQuery(t *testing.T) { k.SetOwner(ctx, owner.Address) // ACT: Attempt to query owner with state. - res, err := server.Owner(goCtx, &types.QueryOwner{}) + res, err := server.Owner(ctx, &types.QueryOwner{}) // ASSERT: The query should've succeeded, with empty pending owner. require.NoError(t, err) require.Equal(t, owner.Address, res.Owner) @@ -81,7 +77,7 @@ func TestOwnerQuery(t *testing.T) { k.SetPendingOwner(ctx, pendingOwner.Address) // ACT: Attempt to query owner with state. - res, err = server.Owner(goCtx, &types.QueryOwner{}) + res, err = server.Owner(ctx, &types.QueryOwner{}) // ASSERT: The query should've succeeded, with pending owner. require.NoError(t, err) require.Equal(t, owner.Address, res.Owner) @@ -90,16 +86,15 @@ func TestOwnerQuery(t *testing.T) { func TestBurnersQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query burners with invalid request. - _, err := server.Burners(goCtx, nil) + _, err := server.Burners(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query burners with no state. - res, err := server.Burners(goCtx, &types.QueryBurners{}) + res, err := server.Burners(ctx, &types.QueryBurners{}) // ASSERT: The query should've succeeded, and returned no burners. require.NoError(t, err) require.Empty(t, res.Burners) @@ -110,7 +105,7 @@ func TestBurnersQuery(t *testing.T) { k.SetBurner(ctx, burner2.Address, ONE.MulRaw(2)) // ACT: Attempt to query burners with state. - res, err = server.Burners(goCtx, &types.QueryBurners{}) + res, err = server.Burners(ctx, &types.QueryBurners{}) // ASSERT: The query should've succeeded, and returned burners. require.NoError(t, err) require.Len(t, res.Burners, 2) @@ -126,16 +121,15 @@ func TestBurnersQuery(t *testing.T) { func TestMintersQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query minters with invalid request. - _, err := server.Minters(goCtx, nil) + _, err := server.Minters(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query minters with no state. - res, err := server.Minters(goCtx, &types.QueryMinters{}) + res, err := server.Minters(ctx, &types.QueryMinters{}) // ASSERT: The query should've succeeded, and returned no minters. require.NoError(t, err) require.Empty(t, res.Minters) @@ -146,7 +140,7 @@ func TestMintersQuery(t *testing.T) { k.SetMinter(ctx, minter2.Address, ONE.MulRaw(2)) // ACT: Attempt to query minters with state. - res, err = server.Minters(goCtx, &types.QueryMinters{}) + res, err = server.Minters(ctx, &types.QueryMinters{}) // ASSERT: The query should've succeeded, and returned minters. require.NoError(t, err) require.Len(t, res.Minters, 2) @@ -162,16 +156,15 @@ func TestMintersQuery(t *testing.T) { func TestPausersQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query pausers with invalid request. - _, err := server.Pausers(goCtx, nil) + _, err := server.Pausers(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query pausers with no state. - res, err := server.Pausers(goCtx, &types.QueryPausers{}) + res, err := server.Pausers(ctx, &types.QueryPausers{}) // ASSERT: The query should've succeeded, and returned no pausers. require.NoError(t, err) require.Empty(t, res.Pausers) @@ -182,7 +175,7 @@ func TestPausersQuery(t *testing.T) { k.SetPauser(ctx, pauser2.Address) // ACT: Attempt to query pausers with state. - res, err = server.Pausers(goCtx, &types.QueryPausers{}) + res, err = server.Pausers(ctx, &types.QueryPausers{}) // ASSERT: The query should've succeeded, and returned pausers. require.NoError(t, err) require.Len(t, res.Pausers, 2) @@ -192,16 +185,15 @@ func TestPausersQuery(t *testing.T) { func TestBlockedChannelsQuery(t *testing.T) { k, ctx := mocks.AuraKeeper() - goCtx := sdk.WrapSDKContext(ctx) server := keeper.NewQueryServer(k) // ACT: Attempt to query blocked channels with invalid request. - _, err := server.BlockedChannels(goCtx, nil) + _, err := server.BlockedChannels(ctx, nil) // ASSERT: The query should've failed due to invalid request. require.ErrorContains(t, err, errors.ErrInvalidRequest.Error()) // ACT: Attempt to query blocked channels with no state. - res, err := server.BlockedChannels(goCtx, &types.QueryBlockedChannels{}) + res, err := server.BlockedChannels(ctx, &types.QueryBlockedChannels{}) // ASSERT: The query should've succeeded, and returned no channels. require.NoError(t, err) require.Empty(t, res.BlockedChannels) @@ -212,7 +204,7 @@ func TestBlockedChannelsQuery(t *testing.T) { k.SetBlockedChannel(ctx, channel2) // ACT: Attempt to query blocked channels with state. - res, err = server.BlockedChannels(goCtx, &types.QueryBlockedChannels{}) + res, err = server.BlockedChannels(ctx, &types.QueryBlockedChannels{}) // ASSERT: The query should've succeeded, and returned channels. require.NoError(t, err) require.Len(t, res.BlockedChannels, 2) diff --git a/x/aura/module.go b/x/aura/module.go index 6a16ac7..b3468df 100644 --- a/x/aura/module.go +++ b/x/aura/module.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -33,10 +34,12 @@ var ( // -type AppModuleBasic struct{} +type AppModuleBasic struct { + addressCodec address.Codec +} -func NewAppModuleBasic() AppModuleBasic { - return AppModuleBasic{} +func NewAppModuleBasic(addressCodec address.Codec) AppModuleBasic { + return AppModuleBasic{addressCodec: addressCodec} } func (AppModuleBasic) Name() string { return types.ModuleName } @@ -69,7 +72,7 @@ func (b AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, _ client.TxEncoding return fmt.Errorf("failed to unmarshal %s genesis state: %w", types.ModuleName, err) } - return genesis.Validate() + return genesis.Validate(b.addressCodec) } // @@ -80,9 +83,9 @@ type AppModule struct { keeper *keeper.Keeper } -func NewAppModule(keeper *keeper.Keeper) AppModule { +func NewAppModule(addressCodec address.Codec, keeper *keeper.Keeper) AppModule { return AppModule{ - AppModuleBasic: NewAppModuleBasic(), + AppModuleBasic: NewAppModuleBasic(addressCodec), keeper: keeper, } } @@ -97,7 +100,7 @@ func (m AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, bz json.Raw var genesis types.GenesisState cdc.MustUnmarshalJSON(bz, &genesis) - InitGenesis(ctx, m.keeper, genesis) + InitGenesis(ctx, m.keeper, m.addressCodec, genesis) } func (m AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { diff --git a/x/aura/types/blocklist/codec.go b/x/aura/types/blocklist/codec.go index c719265..2e27130 100644 --- a/x/aura/types/blocklist/codec.go +++ b/x/aura/types/blocklist/codec.go @@ -25,10 +25,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } -var ( - amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) -) +var amino = codec.NewLegacyAmino() func init() { RegisterLegacyAminoCodec(amino) diff --git a/x/aura/types/blocklist/genesis.go b/x/aura/types/blocklist/genesis.go index 37bbee1..cdacb49 100644 --- a/x/aura/types/blocklist/genesis.go +++ b/x/aura/types/blocklist/genesis.go @@ -3,28 +3,28 @@ package blocklist import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/core/address" ) func DefaultGenesisState() GenesisState { return GenesisState{} } -func (gs *GenesisState) Validate() error { +func (gs *GenesisState) Validate(cdc address.Codec) error { if gs.Owner != "" { - if _, err := sdk.AccAddressFromBech32(gs.Owner); err != nil { + if _, err := cdc.StringToBytes(gs.Owner); err != nil { return fmt.Errorf("invalid blocklist owner address (%s): %s", gs.Owner, err) } } if gs.PendingOwner != "" { - if _, err := sdk.AccAddressFromBech32(gs.PendingOwner); err != nil { + if _, err := cdc.StringToBytes(gs.PendingOwner); err != nil { return fmt.Errorf("invalid pending blocklist owner address (%s): %s", gs.PendingOwner, err) } } for _, address := range gs.BlockedAddresses { - if _, err := sdk.AccAddressFromBech32(address); err != nil { + if _, err := cdc.StringToBytes(address); err != nil { return fmt.Errorf("invalid blocked address (%s): %s", address, err) } } diff --git a/x/aura/types/codec.go b/x/aura/types/codec.go index 2f5bbfe..6340736 100644 --- a/x/aura/types/codec.go +++ b/x/aura/types/codec.go @@ -64,10 +64,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } -var ( - amino = codec.NewLegacyAmino() - ModuleCdc = codec.NewAminoCodec(amino) -) +var amino = codec.NewLegacyAmino() func init() { RegisterLegacyAminoCodec(amino) diff --git a/x/aura/types/genesis.go b/x/aura/types/genesis.go index 387ae90..5d8bee3 100644 --- a/x/aura/types/genesis.go +++ b/x/aura/types/genesis.go @@ -3,7 +3,7 @@ package types import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" + "cosmossdk.io/core/address" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" "github.com/ondoprotocol/usdy-noble/v2/x/aura/types/blocklist" ) @@ -15,21 +15,25 @@ func DefaultGenesisState() *GenesisState { } } -func (gs *GenesisState) Validate() error { +func (gs *GenesisState) Validate(cdc address.Codec) error { + if err := gs.BlocklistState.Validate(cdc); err != nil { + return err + } + if gs.Owner != "" { - if _, err := sdk.AccAddressFromBech32(gs.Owner); err != nil { + if _, err := cdc.StringToBytes(gs.Owner); err != nil { return fmt.Errorf("invalid owner address (%s): %s", gs.Owner, err) } } if gs.PendingOwner != "" { - if _, err := sdk.AccAddressFromBech32(gs.PendingOwner); err != nil { + if _, err := cdc.StringToBytes(gs.PendingOwner); err != nil { return fmt.Errorf("invalid pending owner address (%s): %s", gs.PendingOwner, err) } } for _, burner := range gs.Burners { - if _, err := sdk.AccAddressFromBech32(burner.Address); err != nil { + if _, err := cdc.StringToBytes(burner.Address); err != nil { return fmt.Errorf("invalid burner address (%s): %s", burner.Address, err) } @@ -39,7 +43,7 @@ func (gs *GenesisState) Validate() error { } for _, minter := range gs.Minters { - if _, err := sdk.AccAddressFromBech32(minter.Address); err != nil { + if _, err := cdc.StringToBytes(minter.Address); err != nil { return fmt.Errorf("invalid minter address (%s): %s", minter.Address, err) } @@ -49,7 +53,7 @@ func (gs *GenesisState) Validate() error { } for _, pauser := range gs.Pausers { - if _, err := sdk.AccAddressFromBech32(pauser); err != nil { + if _, err := cdc.StringToBytes(pauser); err != nil { return fmt.Errorf("invalid pauser address (%s): %s", pauser, err) } } @@ -60,5 +64,5 @@ func (gs *GenesisState) Validate() error { } } - return gs.BlocklistState.Validate() + return nil }