From dcf62168a0a1d3d8df1714a315ecccd7da410e54 Mon Sep 17 00:00:00 2001 From: mattverse Date: Tue, 17 May 2022 19:42:01 +0900 Subject: [PATCH] disable stableswap --- x/gamm/keeper/msg_server.go | 31 +++++++++++++++---------------- x/gamm/module.go | 7 +++---- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go index 77febd44663..7fc47f9f8fd 100644 --- a/x/gamm/keeper/msg_server.go +++ b/x/gamm/keeper/msg_server.go @@ -7,7 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap" "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) @@ -27,16 +26,16 @@ func NewBalancerMsgServerImpl(keeper *Keeper) balancer.MsgServer { } } -func NewStableswapMsgServerImpl(keeper *Keeper) stableswap.MsgServer { - return &msgServer{ - keeper: keeper, - } -} +// func NewStableswapMsgServerImpl(keeper *Keeper) stableswap.MsgServer { +// return &msgServer{ +// keeper: keeper, +// } +// } var ( - _ types.MsgServer = msgServer{} - _ balancer.MsgServer = msgServer{} - _ stableswap.MsgServer = msgServer{} + _ types.MsgServer = msgServer{} + _ balancer.MsgServer = msgServer{} + // _ stableswap.MsgServer = msgServer{} ) func (server msgServer) CreateBalancerPool(goCtx context.Context, msg *balancer.MsgCreateBalancerPool) (*balancer.MsgCreateBalancerPoolResponse, error) { @@ -44,13 +43,13 @@ func (server msgServer) CreateBalancerPool(goCtx context.Context, msg *balancer. return &balancer.MsgCreateBalancerPoolResponse{PoolID: poolId}, err } -func (server msgServer) CreateStableswapPool(goCtx context.Context, msg *stableswap.MsgCreateStableswapPool) (*stableswap.MsgCreateStableswapPoolResponse, error) { - poolId, err := server.CreatePool(goCtx, msg) - if err != nil { - return nil, err - } - return &stableswap.MsgCreateStableswapPoolResponse{PoolID: poolId}, nil -} +// func (server msgServer) CreateStableswapPool(goCtx context.Context, msg *stableswap.MsgCreateStableswapPool) (*stableswap.MsgCreateStableswapPoolResponse, error) { +// poolId, err := server.CreatePool(goCtx, msg) +// if err != nil { +// return nil, err +// } +// return &stableswap.MsgCreateStableswapPoolResponse{PoolID: poolId}, nil +// } func (server msgServer) CreatePool(goCtx context.Context, msg types.CreatePoolMsg) (poolId uint64, err error) { ctx := sdk.UnwrapSDKContext(goCtx) diff --git a/x/gamm/module.go b/x/gamm/module.go index fbd09ad7c1c..555d100fe51 100644 --- a/x/gamm/module.go +++ b/x/gamm/module.go @@ -22,7 +22,6 @@ import ( "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/stableswap" "github.com/osmosis-labs/osmosis/v7/x/gamm/simulation" "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) @@ -44,7 +43,7 @@ func (AppModuleBasic) Name() string { return types.ModuleName } func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { types.RegisterLegacyAminoCodec(cdc) balancer.RegisterLegacyAminoCodec(cdc) - stableswap.RegisterLegacyAminoCodec(cdc) + // stableswap.RegisterLegacyAminoCodec(cdc) } // DefaultGenesis returns default genesis state as raw bytes for the gamm @@ -83,7 +82,7 @@ func (b AppModuleBasic) GetQueryCmd() *cobra.Command { func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) { types.RegisterInterfaces(registry) balancer.RegisterInterfaces(registry) - stableswap.RegisterInterfaces(registry) + // stableswap.RegisterInterfaces(registry) } type AppModule struct { @@ -100,7 +99,7 @@ type AppModule struct { func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(&am.keeper)) balancer.RegisterMsgServer(cfg.MsgServer(), keeper.NewBalancerMsgServerImpl(&am.keeper)) - stableswap.RegisterMsgServer(cfg.MsgServer(), keeper.NewStableswapMsgServerImpl(&am.keeper)) + // stableswap.RegisterMsgServer(cfg.MsgServer(), keeper.NewStableswapMsgServerImpl(&am.keeper)) types.RegisterQueryServer(cfg.QueryServer(), keeper.NewQuerier(am.keeper)) }