Skip to content

Commit

Permalink
feat: jsmndist->botanydist
Browse files Browse the repository at this point in the history
  • Loading branch information
kimurayu45z committed Sep 6, 2021
1 parent 40ac995 commit 75bd47a
Show file tree
Hide file tree
Showing 77 changed files with 955 additions and 952 deletions.
40 changes: 20 additions & 20 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ import (
"github.com/lcnem/jpyx/x/auction"
auctionkeeper "github.com/lcnem/jpyx/x/auction/keeper"
auctiontypes "github.com/lcnem/jpyx/x/auction/types"
"github.com/lcnem/jpyx/x/botanydist"
botanydistkeeper "github.com/lcnem/jpyx/x/botanydist/keeper"
botanydisttypes "github.com/lcnem/jpyx/x/botanydist/types"
"github.com/lcnem/jpyx/x/cdp"
cdpkeeper "github.com/lcnem/jpyx/x/cdp/keeper"
cdptypes "github.com/lcnem/jpyx/x/cdp/types"
"github.com/lcnem/jpyx/x/incentive"
incentivekeeper "github.com/lcnem/jpyx/x/incentive/keeper"
incentivetypes "github.com/lcnem/jpyx/x/incentive/types"
"github.com/lcnem/jpyx/x/jsmndist"
jsmndistkeeper "github.com/lcnem/jpyx/x/jsmndist/keeper"
jsmndisttypes "github.com/lcnem/jpyx/x/jsmndist/types"
"github.com/lcnem/jpyx/x/pricefeed"
pricefeedkeeper "github.com/lcnem/jpyx/x/pricefeed/keeper"
pricefeedtypes "github.com/lcnem/jpyx/x/pricefeed/types"
Expand Down Expand Up @@ -153,7 +153,7 @@ var (
auction.AppModuleBasic{},
cdp.AppModuleBasic{},
pricefeed.AppModuleBasic{},
jsmndist.AppModuleBasic{},
botanydist.AppModuleBasic{},
incentive.AppModuleBasic{},
)

Expand All @@ -170,7 +170,7 @@ var (
auctiontypes.ModuleName: nil,
cdptypes.ModuleName: {authtypes.Minter, authtypes.Burner},
cdptypes.LiquidatorMacc: {authtypes.Minter, authtypes.Burner},
jsmndisttypes.ModuleName: {authtypes.Minter},
botanydisttypes.ModuleName: {authtypes.Minter},
}

// module accounts that are allowed to receive tokens
Expand Down Expand Up @@ -233,11 +233,11 @@ type App struct {
ScopedTransferKeeper capabilitykeeper.ScopedKeeper

// this line is used by starport scaffolding # stargate/app/keeperDeclaration
auctionKeeper auctionkeeper.Keeper
cdpKeeper cdpkeeper.Keeper
incentiveKeeper incentivekeeper.Keeper
jsmndistKeeper jsmndistkeeper.Keeper
pricefeedKeeper pricefeedkeeper.Keeper
auctionKeeper auctionkeeper.Keeper
cdpKeeper cdpkeeper.Keeper
incentiveKeeper incentivekeeper.Keeper
botanydistKeeper botanydistkeeper.Keeper
pricefeedKeeper pricefeedkeeper.Keeper

// the module manager
mm *module.Manager
Expand Down Expand Up @@ -271,7 +271,7 @@ func NewApp(
evidencetypes.StoreKey, liquiditytypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
// this line is used by starport scaffolding # stargate/app/storeKey
auctiontypes.StoreKey, cdptypes.StoreKey, incentivetypes.StoreKey,
jsmndisttypes.StoreKey, pricefeedtypes.StoreKey,
botanydisttypes.StoreKey, pricefeedtypes.StoreKey,
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
Expand Down Expand Up @@ -403,11 +403,11 @@ func NewApp(
app.BankKeeper,
&cdpKeeper,
)
app.jsmndistKeeper = jsmndistkeeper.NewKeeper(
app.botanydistKeeper = botanydistkeeper.NewKeeper(
appCodec,
keys[jsmndisttypes.StoreKey],
keys[jsmndisttypes.MemStoreKey],
app.GetSubspace(jsmndisttypes.ModuleName),
keys[botanydisttypes.StoreKey],
keys[botanydisttypes.MemStoreKey],
app.GetSubspace(botanydisttypes.ModuleName),
app.AccountKeeper,
app.BankKeeper,
)
Expand Down Expand Up @@ -453,7 +453,7 @@ func NewApp(
auction.NewAppModule(appCodec, app.auctionKeeper, app.AccountKeeper, app.BankKeeper),
cdp.NewAppModule(appCodec, app.cdpKeeper, app.AccountKeeper, app.BankKeeper, app.pricefeedKeeper),
incentive.NewAppModule(appCodec, app.incentiveKeeper, app.AccountKeeper, app.BankKeeper, app.cdpKeeper),
jsmndist.NewAppModule(appCodec, app.jsmndistKeeper, app.AccountKeeper, app.BankKeeper),
botanydist.NewAppModule(appCodec, app.botanydistKeeper, app.AccountKeeper, app.BankKeeper),
pricefeed.NewAppModule(appCodec, app.pricefeedKeeper, app.AccountKeeper),
)

Expand All @@ -464,7 +464,7 @@ func NewApp(
app.mm.SetOrderBeginBlockers(
upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName,
evidencetypes.ModuleName, stakingtypes.ModuleName, liquiditytypes.ModuleName, ibchost.ModuleName,
jsmndisttypes.ModuleName, auctiontypes.ModuleName, cdptypes.ModuleName,
botanydisttypes.ModuleName, auctiontypes.ModuleName, cdptypes.ModuleName,
incentivetypes.ModuleName,
)

Expand Down Expand Up @@ -498,7 +498,7 @@ func NewApp(
pricefeedtypes.ModuleName,
cdptypes.ModuleName,
incentivetypes.ModuleName,
jsmndisttypes.ModuleName,
botanydisttypes.ModuleName,
)

app.mm.RegisterInvariants(&app.CrisisKeeper)
Expand Down Expand Up @@ -527,7 +527,7 @@ func NewApp(
// auction.NewAppModule(appCodec, app.auctionKeeper, app.AccountKeeper, app.BankKeeper),
// cdp.NewAppModule(appCodec, app.cdpKeeper, app.AccountKeeper, app.BankKeeper, app.pricefeedKeeper),
// incentive.NewAppModule(appCodec, app.incentiveKeeper, app.AccountKeeper, app.BankKeeper, app.cdpKeeper),
// jsmndist.NewAppModule(appCodec, app.jsmndistKeeper, app.AccountKeeper, app.BankKeeper),
// botanydist.NewAppModule(appCodec, app.botanydistKeeper, app.AccountKeeper, app.BankKeeper),
// pricefeed.NewAppModule(appCodec, app.pricefeedKeeper, app.AccountKeeper),
)

Expand Down Expand Up @@ -722,7 +722,7 @@ func initParamsKeeper(appCodec codec.BinaryMarshaler, legacyAmino *codec.LegacyA
paramsKeeper.Subspace(auctiontypes.ModuleName)
paramsKeeper.Subspace(cdptypes.ModuleName)
paramsKeeper.Subspace(incentivetypes.ModuleName)
paramsKeeper.Subspace(jsmndisttypes.ModuleName)
paramsKeeper.Subspace(botanydisttypes.ModuleName)
paramsKeeper.Subspace(pricefeedtypes.ModuleName)

return paramsKeeper
Expand Down
6 changes: 3 additions & 3 deletions app/test_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
// "github.com/cosmos/cosmos-sdk/x/supply"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
auctionkeeper "github.com/lcnem/jpyx/x/auction/keeper"
botanydistkeeper "github.com/lcnem/jpyx/x/botanydist/keeper"
cdpkeeper "github.com/lcnem/jpyx/x/cdp/keeper"
incentivekeeper "github.com/lcnem/jpyx/x/incentive/keeper"
jsmndistkeeper "github.com/lcnem/jpyx/x/jsmndist/keeper"
pricefeedkeeper "github.com/lcnem/jpyx/x/pricefeed/keeper"
// authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
// "github.com/cosmos/cosmos-sdk/x/supply"
Expand Down Expand Up @@ -89,8 +89,8 @@ func (tApp TestApp) GetCDPKeeper() cdpkeeper.Keeper { return tApp.cd
func (tApp TestApp) GetPriceFeedKeeper() pricefeedkeeper.Keeper { return tApp.pricefeedKeeper }

// func (tApp TestApp) GetBep3Keeper() bep3.Keeper { return tApp.bep3Keeper }
func (tApp TestApp) GetJsmndistKeeper() jsmndistkeeper.Keeper { return tApp.jsmndistKeeper }
func (tApp TestApp) GetIncentiveKeeper() incentivekeeper.Keeper { return tApp.incentiveKeeper }
func (tApp TestApp) GetBotanydistKeeper() botanydistkeeper.Keeper { return tApp.botanydistKeeper }
func (tApp TestApp) GetIncentiveKeeper() incentivekeeper.Keeper { return tApp.incentiveKeeper }

// func (tApp TestApp) GetHarvestKeeper() harvest.Keeper { return tApp.harvestKeeper }
// func (tApp TestApp) GetCommitteeKeeper() committee.Keeper { return tApp.committeeKeeper }
Expand Down
4 changes: 2 additions & 2 deletions docs/client/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
}
},
{
"url": "./tmp-swagger-gen/jsmndist/query.swagger.json",
"url": "./tmp-swagger-gen/botanydist/query.swagger.json",
"operationIds": {
"rename": {
"Params": "JsmndistParams"
"Params": "BotanydistParams"
}
}
},
Expand Down
30 changes: 15 additions & 15 deletions docs/client/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2594,7 +2594,7 @@ paths:
}
tags:
- Query
/jpyx/incentive/params:
/botany/incentive/params:
get:
operationId: IncentiveParams
responses:
Expand All @@ -2606,7 +2606,7 @@ paths:
params:
type: object
properties:
jpyx_minting_reward_periods:
cdp_minting_reward_periods:
type: array
items:
type: object
Expand Down Expand Up @@ -2676,7 +2676,7 @@ paths:
format: byte
tags:
- Query
/jpyx/jsmndist/balances:
/botany/botanydist/balances:
get:
summary: 'this line is used by starport scaffolding # 2'
operationId: Balances
Expand Down Expand Up @@ -2727,9 +2727,9 @@ paths:
format: byte
tags:
- Query
/jpyx/jsmndist/params:
/botany/botanydist/params:
get:
operationId: JsmndistParams
operationId: BotanydistParams
responses:
'200':
description: A successful response.
Expand Down Expand Up @@ -4905,7 +4905,7 @@ definitions:
NOTE: The amount field is an Int which implements the custom method
signatures required by gogoproto.
jpyx.incentive.Multiplier:
botany.incentive.Multiplier:
type: object
properties:
name:
Expand All @@ -4915,10 +4915,10 @@ definitions:
format: int64
factor:
type: string
jpyx.incentive.Params:
botany.incentive.Params:
type: object
properties:
jpyx_minting_reward_periods:
cdp_minting_reward_periods:
type: array
items:
type: object
Expand Down Expand Up @@ -4963,13 +4963,13 @@ definitions:
claim_end:
type: string
format: date-time
jpyx.incentive.QueryParamsResponse:
botany.incentive.QueryParamsResponse:
type: object
properties:
params:
type: object
properties:
jpyx_minting_reward_periods:
cdp_minting_reward_periods:
type: array
items:
type: object
Expand Down Expand Up @@ -5014,7 +5014,7 @@ definitions:
claim_end:
type: string
format: date-time
jpyx.incentive.RewardPeriod:
botany.incentive.RewardPeriod:
type: object
properties:
active:
Expand All @@ -5039,7 +5039,7 @@ definitions:
NOTE: The amount field is an Int which implements the custom method
signatures required by gogoproto.
jpyx.jsmndist.Params:
botany.botanydist.Params:
type: object
properties:
active:
Expand All @@ -5057,7 +5057,7 @@ definitions:
format: date-time
inflation:
type: string
jpyx.jsmndist.Period:
botany.botanydist.Period:
type: object
properties:
start:
Expand All @@ -5068,7 +5068,7 @@ definitions:
format: date-time
inflation:
type: string
jpyx.jsmndist.QueryGetBalancesResponse:
botany.botanydist.QueryGetBalancesResponse:
type: object
properties:
balances:
Expand All @@ -5085,7 +5085,7 @@ definitions:
NOTE: The amount field is an Int which implements the custom method
signatures required by gogoproto.
jpyx.jsmndist.QueryParamsResponse:
botany.botanydist.QueryParamsResponse:
type: object
properties:
params:
Expand Down
Loading

0 comments on commit 75bd47a

Please sign in to comment.