Skip to content

Register interfaces for UnregisterContract and ContractDepositRent #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codchen merged 1 commit into from
Feb 10, 2023
Merged

Register interfaces for UnregisterContract and ContractDepositRent #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions x/dex/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *types.MsgUpdateQuantityTickSize:
res, err := msgServer.UpdateQuantityTickSize(sdk.WrapSDKContext(ctx), msg)
return sdk.WrapServiceResult(ctx, res, err)
case *types.MsgUnregisterContract:
res, err := msgServer.UnregisterContract(sdk.WrapSDKContext(ctx), msg)
return sdk.WrapServiceResult(ctx, res, err)
case *types.MsgContractDepositRent:
res, err := msgServer.ContractDepositRent(sdk.WrapSDKContext(ctx), msg)
return sdk.WrapServiceResult(ctx, res, err)
// this line is used by starport scaffolding # 1
default:
errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg)
Expand Down
11 changes: 7 additions & 4 deletions x/dex/keeper/msgserver/msg_server_contract_deposit_rent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
keepertest "github.com/sei-protocol/sei-chain/testutil/keeper"
"github.com/sei-protocol/sei-chain/x/dex"
dexcache "github.com/sei-protocol/sei-chain/x/dex/cache"
"github.com/sei-protocol/sei-chain/x/dex/keeper/msgserver"
"github.com/sei-protocol/sei-chain/x/dex/types"
Expand Down Expand Up @@ -90,7 +91,9 @@ func TestDepositRent(t *testing.T) {
require.NoError(t, err)
balance := dexkeeper.BankKeeper.GetBalance(ctx, testAccount, "usei")
require.Equal(t, int64(8900000), balance.Amount.Int64())
_, err = server.ContractDepositRent(wctx, &types.MsgContractDepositRent{

handler := dex.NewHandler(dexkeeper)
_, err = handler(ctx, &types.MsgContractDepositRent{
Sender: testAccount.String(),
ContractAddr: TestContractA,
Amount: 1000000,
Expand All @@ -102,21 +105,21 @@ func TestDepositRent(t *testing.T) {
require.Equal(t, int64(7900000), balance.Amount.Int64())

// deposit exceeds limit
_, err = server.ContractDepositRent(wctx, &types.MsgContractDepositRent{
_, err = handler(ctx, &types.MsgContractDepositRent{
Sender: testAccount.String(),
ContractAddr: TestContractA,
Amount: math.MaxUint64,
})
require.Error(t, err)
// deposit + prev balance exceeds limit
_, err = server.ContractDepositRent(wctx, &types.MsgContractDepositRent{
_, err = handler(ctx, &types.MsgContractDepositRent{
Sender: testAccount.String(),
ContractAddr: TestContractA,
Amount: math.MaxUint64/140000000 - 500000,
})
require.Error(t, err)
// deposit + prev balance overflows
_, err = server.ContractDepositRent(wctx, &types.MsgContractDepositRent{
_, err = handler(ctx, &types.MsgContractDepositRent{
Sender: testAccount.String(),
ContractAddr: TestContractA,
Amount: math.MaxUint64 - 500000,
Expand Down
5 changes: 4 additions & 1 deletion x/dex/keeper/msgserver/msg_server_unregister_contract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
keepertest "github.com/sei-protocol/sei-chain/testutil/keeper"
"github.com/sei-protocol/sei-chain/x/dex"
dexcache "github.com/sei-protocol/sei-chain/x/dex/cache"
"github.com/sei-protocol/sei-chain/x/dex/keeper/msgserver"
"github.com/sei-protocol/sei-chain/x/dex/types"
Expand Down Expand Up @@ -64,7 +65,9 @@ func TestUnregisterContractSetSiblings(t *testing.T) {
require.NoError(t, err)
balance := keeper.BankKeeper.GetBalance(ctx, testAccount, "usei")
require.Equal(t, int64(8900000), balance.Amount.Int64())
_, err = server.UnregisterContract(wctx, &types.MsgUnregisterContract{

handler := dex.NewHandler(keeper)
_, err = handler(ctx, &types.MsgUnregisterContract{
Creator: testAccount.String(),
ContractAddr: contractAddr.String(),
})
Expand Down
8 changes: 8 additions & 0 deletions x/dex/types/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ func RegisterCodec(cdc *codec.LegacyAmino) {
cdc.RegisterConcrete(&MsgUpdatePriceTickSize{}, "dex/MsgUpdatePriceTickSize", nil)
cdc.RegisterConcrete(&MsgUpdateQuantityTickSize{}, "dex/MsgUpdateQuantityTickSize", nil)
cdc.RegisterConcrete(&AddAssetMetadataProposal{}, "dex/AddAssetMetadataProposal", nil)
cdc.RegisterConcrete(&MsgUnregisterContract{}, "dex/MsgUnregisterContract", nil)
cdc.RegisterConcrete(&MsgContractDepositRent{}, "dex/MsgContractDepositRent", nil)
// this line is used by starport scaffolding # 2
}

Expand All @@ -41,6 +43,12 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
registry.RegisterImplementations((*govtypes.Content)(nil),
&AddAssetMetadataProposal{},
)
registry.RegisterImplementations((*sdk.Msg)(nil),
&MsgUnregisterContract{},
)
registry.RegisterImplementations((*sdk.Msg)(nil),
&MsgContractDepositRent{},
)
// this line is used by starport scaffolding # 3

msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
Expand Down