Skip to content

Commit

Permalink
Removing liquidity module.
Browse files Browse the repository at this point in the history
  • Loading branch information
@deepanshutr
deepanshutr committed Apr 17, 2022
1 parent 58249d0 commit b6e05f9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 32 deletions.
40 changes: 8 additions & 32 deletions application/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ import (
ibcHost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibcKeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
"github.com/gorilla/mux"
"github.com/gravity-devs/liquidity/x/liquidity"
liquidityKeeper "github.com/gravity-devs/liquidity/x/liquidity/keeper"
liquidityTypes "github.com/gravity-devs/liquidity/x/liquidity/types"
"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
"github.com/strangelove-ventures/packet-forward-middleware/v2/router"
Expand Down Expand Up @@ -144,7 +141,6 @@ var (
evidence.AppModuleBasic{},
transfer.AppModuleBasic{},
vesting.AppModuleBasic{},
liquidity.AppModuleBasic{},
router.AppModuleBasic{},
ica.AppModuleBasic{},
)
Expand All @@ -157,7 +153,6 @@ var (
stakingTypes.BondedPoolName: {authTypes.Burner, authTypes.Staking},
stakingTypes.NotBondedPoolName: {authTypes.Burner, authTypes.Staking},
govTypes.ModuleName: {authTypes.Burner},
liquidityTypes.ModuleName: {authTypes.Minter, authTypes.Burner},
ibcTransferTypes.ModuleName: {authTypes.Minter, authTypes.Burner},
}
)
Expand Down Expand Up @@ -196,14 +191,13 @@ type GaiaApp struct { // nolint: golint
UpgradeKeeper upgradeKeeper.Keeper
ParamsKeeper paramsKeeper.Keeper
// IBC Keeper must be a pointer in the application, so we can SetRouter on it correctly
IBCKeeper *ibcKeeper.Keeper
ICAHostKeeper icaHostKeeper.Keeper
EvidenceKeeper evidenceKeeper.Keeper
TransferKeeper ibcTransferKeeper.Keeper
FeeGrantKeeper feeGrantKeeper.Keeper
AuthzKeeper authzKeeper.Keeper
LiquidityKeeper liquidityKeeper.Keeper
RouterKeeper routerKeeper.Keeper
IBCKeeper *ibcKeeper.Keeper
ICAHostKeeper icaHostKeeper.Keeper
EvidenceKeeper evidenceKeeper.Keeper
TransferKeeper ibcTransferKeeper.Keeper
FeeGrantKeeper feeGrantKeeper.Keeper
AuthzKeeper authzKeeper.Keeper
RouterKeeper routerKeeper.Keeper

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilityKeeper.ScopedKeeper
Expand Down Expand Up @@ -253,7 +247,7 @@ func NewGaiaApp(
authTypes.StoreKey, bankTypes.StoreKey, stakingTypes.StoreKey,
mintTypes.StoreKey, distributionTypes.StoreKey, slashingTypes.StoreKey,
govTypes.StoreKey, paramsTypes.StoreKey, ibcHost.StoreKey, upgradeTypes.StoreKey,
evidenceTypes.StoreKey, liquidityTypes.StoreKey, ibcTransferTypes.StoreKey,
evidenceTypes.StoreKey, ibcTransferTypes.StoreKey,
capabilityTypes.StoreKey, feegrant.StoreKey, authzKeeper.StoreKey, routerTypes.StoreKey, icaHostTypes.StoreKey,
)
transientStoreKeys := sdk.NewTransientStoreKeys(paramsTypes.TStoreKey)
Expand Down Expand Up @@ -359,14 +353,6 @@ func NewGaiaApp(
homePath,
app.BaseApp,
)
app.LiquidityKeeper = liquidityKeeper.NewKeeper(
appCodec,
keys[liquidityTypes.StoreKey],
app.GetSubspace(liquidityTypes.ModuleName),
app.BankKeeper,
app.AccountKeeper,
app.DistributionKeeper,
)

// register the staking hooks
// NOTE: StakingKeeper above is passed by reference, so that it will contain these hooks
Expand Down Expand Up @@ -475,7 +461,6 @@ func NewGaiaApp(
authzModule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
ibc.NewAppModule(app.IBCKeeper),
params.NewAppModule(app.ParamsKeeper),
liquidity.NewAppModule(appCodec, app.LiquidityKeeper, app.AccountKeeper, app.BankKeeper, app.DistributionKeeper),
transferModule,
icaModule,
routerModule,
Expand All @@ -493,7 +478,6 @@ func NewGaiaApp(
crisisTypes.ModuleName,
govTypes.ModuleName,
stakingTypes.ModuleName,
liquidityTypes.ModuleName,
ibcTransferTypes.ModuleName,
ibcHost.ModuleName,
icaTypes.ModuleName,
Expand All @@ -514,7 +498,6 @@ func NewGaiaApp(
crisisTypes.ModuleName,
govTypes.ModuleName,
stakingTypes.ModuleName,
liquidityTypes.ModuleName,
ibcTransferTypes.ModuleName,
ibcHost.ModuleName,
icaTypes.ModuleName,
Expand Down Expand Up @@ -553,7 +536,6 @@ func NewGaiaApp(
ibcHost.ModuleName,
icaTypes.ModuleName,
evidenceTypes.ModuleName,
liquidityTypes.ModuleName,
feegrant.ModuleName,
authz.ModuleName,
authTypes.ModuleName,
Expand Down Expand Up @@ -587,7 +569,6 @@ func NewGaiaApp(
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
params.NewAppModule(app.ParamsKeeper),
evidence.NewAppModule(app.EvidenceKeeper),
liquidity.NewAppModule(appCodec, app.LiquidityKeeper, app.AccountKeeper, app.BankKeeper, app.DistributionKeeper),
ibc.NewAppModule(app.IBCKeeper),
transferModule,
)
Expand Down Expand Up @@ -653,10 +634,6 @@ func NewGaiaApp(
stakingMsgCreateValidator,
vestingMsgCreateVestingAccount,
transferMsgTransfer,
liquidityMsgCreatePool,
liquidityMsgSwapWithinBatch,
liquidityMsgDepositWithinBatch,
liquidityMsgWithdrawWithinBatch,
},
}

Expand Down Expand Up @@ -846,7 +823,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
ParamsKeeper.Subspace(slashingTypes.ModuleName)
ParamsKeeper.Subspace(govTypes.ModuleName).WithKeyTable(govTypes.ParamKeyTable())
ParamsKeeper.Subspace(crisisTypes.ModuleName)
ParamsKeeper.Subspace(liquidityTypes.ModuleName)
ParamsKeeper.Subspace(ibcTransferTypes.ModuleName)
ParamsKeeper.Subspace(ibcHost.ModuleName)
ParamsKeeper.Subspace(routerTypes.ModuleName).WithKeyTable(routerTypes.ParamKeyTable())
Expand Down
8 changes: 8 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
github.com/gin-gonic/gin v1.7.0 h1:jGB9xAJQ12AIGNB4HguylppmDK1Am9ppF7XnGXXJuoU=
github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
Expand All @@ -312,6 +313,7 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
Expand Down Expand Up @@ -388,6 +390,7 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
Expand Down Expand Up @@ -457,6 +460,7 @@ github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIv
github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0=
github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
Expand Down Expand Up @@ -675,9 +679,11 @@ github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2i
github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
github.com/opencontainers/runc v1.0.3 h1:1hbqejyQWCJBvtKAfdO0b1FmaEf2z/bxnjqbARass5k=
github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
Expand Down Expand Up @@ -788,6 +794,7 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM=
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4=
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
Expand Down Expand Up @@ -1294,6 +1301,7 @@ google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdr
google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
Expand Down

0 comments on commit b6e05f9

Please sign in to comment.