Skip to content

Commit 1c0ac09

Browse files
kimurayu45zkimurayu45z
authored
Merge pull request #92 from lcnem/rename
feat: jsmndist->botanydist
2 parents 40ac995 + 75bd47a commit 1c0ac09

77 files changed

Lines changed: 955 additions & 952 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/app.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ import (
9191
"github.com/lcnem/jpyx/x/auction"
9292
auctionkeeper "github.com/lcnem/jpyx/x/auction/keeper"
9393
auctiontypes "github.com/lcnem/jpyx/x/auction/types"
94+
"github.com/lcnem/jpyx/x/botanydist"
95+
botanydistkeeper "github.com/lcnem/jpyx/x/botanydist/keeper"
96+
botanydisttypes "github.com/lcnem/jpyx/x/botanydist/types"
9497
"github.com/lcnem/jpyx/x/cdp"
9598
cdpkeeper "github.com/lcnem/jpyx/x/cdp/keeper"
9699
cdptypes "github.com/lcnem/jpyx/x/cdp/types"
97100
"github.com/lcnem/jpyx/x/incentive"
98101
incentivekeeper "github.com/lcnem/jpyx/x/incentive/keeper"
99102
incentivetypes "github.com/lcnem/jpyx/x/incentive/types"
100-
"github.com/lcnem/jpyx/x/jsmndist"
101-
jsmndistkeeper "github.com/lcnem/jpyx/x/jsmndist/keeper"
102-
jsmndisttypes "github.com/lcnem/jpyx/x/jsmndist/types"
103103
"github.com/lcnem/jpyx/x/pricefeed"
104104
pricefeedkeeper "github.com/lcnem/jpyx/x/pricefeed/keeper"
105105
pricefeedtypes "github.com/lcnem/jpyx/x/pricefeed/types"
@@ -153,7 +153,7 @@ var (
153153
auction.AppModuleBasic{},
154154
cdp.AppModuleBasic{},
155155
pricefeed.AppModuleBasic{},
156-
jsmndist.AppModuleBasic{},
156+
botanydist.AppModuleBasic{},
157157
incentive.AppModuleBasic{},
158158
)
159159

@@ -170,7 +170,7 @@ var (
170170
auctiontypes.ModuleName: nil,
171171
cdptypes.ModuleName: {authtypes.Minter, authtypes.Burner},
172172
cdptypes.LiquidatorMacc: {authtypes.Minter, authtypes.Burner},
173-
jsmndisttypes.ModuleName: {authtypes.Minter},
173+
botanydisttypes.ModuleName: {authtypes.Minter},
174174
}
175175

176176
// module accounts that are allowed to receive tokens
@@ -233,11 +233,11 @@ type App struct {
233233
ScopedTransferKeeper capabilitykeeper.ScopedKeeper
234234

235235
// this line is used by starport scaffolding # stargate/app/keeperDeclaration
236-
auctionKeeper auctionkeeper.Keeper
237-
cdpKeeper cdpkeeper.Keeper
238-
incentiveKeeper incentivekeeper.Keeper
239-
jsmndistKeeper jsmndistkeeper.Keeper
240-
pricefeedKeeper pricefeedkeeper.Keeper
236+
auctionKeeper auctionkeeper.Keeper
237+
cdpKeeper cdpkeeper.Keeper
238+
incentiveKeeper incentivekeeper.Keeper
239+
botanydistKeeper botanydistkeeper.Keeper
240+
pricefeedKeeper pricefeedkeeper.Keeper
241241

242242
// the module manager
243243
mm *module.Manager
@@ -271,7 +271,7 @@ func NewApp(
271271
evidencetypes.StoreKey, liquiditytypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
272272
// this line is used by starport scaffolding # stargate/app/storeKey
273273
auctiontypes.StoreKey, cdptypes.StoreKey, incentivetypes.StoreKey,
274-
jsmndisttypes.StoreKey, pricefeedtypes.StoreKey,
274+
botanydisttypes.StoreKey, pricefeedtypes.StoreKey,
275275
)
276276
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
277277
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -403,11 +403,11 @@ func NewApp(
403403
app.BankKeeper,
404404
&cdpKeeper,
405405
)
406-
app.jsmndistKeeper = jsmndistkeeper.NewKeeper(
406+
app.botanydistKeeper = botanydistkeeper.NewKeeper(
407407
appCodec,
408-
keys[jsmndisttypes.StoreKey],
409-
keys[jsmndisttypes.MemStoreKey],
410-
app.GetSubspace(jsmndisttypes.ModuleName),
408+
keys[botanydisttypes.StoreKey],
409+
keys[botanydisttypes.MemStoreKey],
410+
app.GetSubspace(botanydisttypes.ModuleName),
411411
app.AccountKeeper,
412412
app.BankKeeper,
413413
)
@@ -453,7 +453,7 @@ func NewApp(
453453
auction.NewAppModule(appCodec, app.auctionKeeper, app.AccountKeeper, app.BankKeeper),
454454
cdp.NewAppModule(appCodec, app.cdpKeeper, app.AccountKeeper, app.BankKeeper, app.pricefeedKeeper),
455455
incentive.NewAppModule(appCodec, app.incentiveKeeper, app.AccountKeeper, app.BankKeeper, app.cdpKeeper),
456-
jsmndist.NewAppModule(appCodec, app.jsmndistKeeper, app.AccountKeeper, app.BankKeeper),
456+
botanydist.NewAppModule(appCodec, app.botanydistKeeper, app.AccountKeeper, app.BankKeeper),
457457
pricefeed.NewAppModule(appCodec, app.pricefeedKeeper, app.AccountKeeper),
458458
)
459459

@@ -464,7 +464,7 @@ func NewApp(
464464
app.mm.SetOrderBeginBlockers(
465465
upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName,
466466
evidencetypes.ModuleName, stakingtypes.ModuleName, liquiditytypes.ModuleName, ibchost.ModuleName,
467-
jsmndisttypes.ModuleName, auctiontypes.ModuleName, cdptypes.ModuleName,
467+
botanydisttypes.ModuleName, auctiontypes.ModuleName, cdptypes.ModuleName,
468468
incentivetypes.ModuleName,
469469
)
470470

@@ -498,7 +498,7 @@ func NewApp(
498498
pricefeedtypes.ModuleName,
499499
cdptypes.ModuleName,
500500
incentivetypes.ModuleName,
501-
jsmndisttypes.ModuleName,
501+
botanydisttypes.ModuleName,
502502
)
503503

504504
app.mm.RegisterInvariants(&app.CrisisKeeper)
@@ -527,7 +527,7 @@ func NewApp(
527527
// auction.NewAppModule(appCodec, app.auctionKeeper, app.AccountKeeper, app.BankKeeper),
528528
// cdp.NewAppModule(appCodec, app.cdpKeeper, app.AccountKeeper, app.BankKeeper, app.pricefeedKeeper),
529529
// incentive.NewAppModule(appCodec, app.incentiveKeeper, app.AccountKeeper, app.BankKeeper, app.cdpKeeper),
530-
// jsmndist.NewAppModule(appCodec, app.jsmndistKeeper, app.AccountKeeper, app.BankKeeper),
530+
// botanydist.NewAppModule(appCodec, app.botanydistKeeper, app.AccountKeeper, app.BankKeeper),
531531
// pricefeed.NewAppModule(appCodec, app.pricefeedKeeper, app.AccountKeeper),
532532
)
533533

@@ -722,7 +722,7 @@ func initParamsKeeper(appCodec codec.BinaryMarshaler, legacyAmino *codec.LegacyA
722722
paramsKeeper.Subspace(auctiontypes.ModuleName)
723723
paramsKeeper.Subspace(cdptypes.ModuleName)
724724
paramsKeeper.Subspace(incentivetypes.ModuleName)
725-
paramsKeeper.Subspace(jsmndisttypes.ModuleName)
725+
paramsKeeper.Subspace(botanydisttypes.ModuleName)
726726
paramsKeeper.Subspace(pricefeedtypes.ModuleName)
727727

728728
return paramsKeeper

‎app/test_common.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
// "github.com/cosmos/cosmos-sdk/x/supply"
3535
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
3636
auctionkeeper "github.com/lcnem/jpyx/x/auction/keeper"
37+
botanydistkeeper "github.com/lcnem/jpyx/x/botanydist/keeper"
3738
cdpkeeper "github.com/lcnem/jpyx/x/cdp/keeper"
3839
incentivekeeper "github.com/lcnem/jpyx/x/incentive/keeper"
39-
jsmndistkeeper "github.com/lcnem/jpyx/x/jsmndist/keeper"
4040
pricefeedkeeper "github.com/lcnem/jpyx/x/pricefeed/keeper"
4141
// authexported "github.com/cosmos/cosmos-sdk/x/auth/exported"
4242
// "github.com/cosmos/cosmos-sdk/x/supply"
@@ -89,8 +89,8 @@ func (tApp TestApp) GetCDPKeeper() cdpkeeper.Keeper { return tApp.cd
8989
func (tApp TestApp) GetPriceFeedKeeper() pricefeedkeeper.Keeper { return tApp.pricefeedKeeper }
9090

9191
// func (tApp TestApp) GetBep3Keeper() bep3.Keeper { return tApp.bep3Keeper }
92-
func (tApp TestApp) GetJsmndistKeeper() jsmndistkeeper.Keeper { return tApp.jsmndistKeeper }
93-
func (tApp TestApp) GetIncentiveKeeper() incentivekeeper.Keeper { return tApp.incentiveKeeper }
92+
func (tApp TestApp) GetBotanydistKeeper() botanydistkeeper.Keeper { return tApp.botanydistKeeper }
93+
func (tApp TestApp) GetIncentiveKeeper() incentivekeeper.Keeper { return tApp.incentiveKeeper }
9494

9595
// func (tApp TestApp) GetHarvestKeeper() harvest.Keeper { return tApp.harvestKeeper }
9696
// func (tApp TestApp) GetCommitteeKeeper() committee.Keeper { return tApp.committeeKeeper }

‎docs/client/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
}
3232
},
3333
{
34-
"url": "./tmp-swagger-gen/jsmndist/query.swagger.json",
34+
"url": "./tmp-swagger-gen/botanydist/query.swagger.json",
3535
"operationIds": {
3636
"rename": {
37-
"Params": "JsmndistParams"
37+
"Params": "BotanydistParams"
3838
}
3939
}
4040
},

‎docs/client/swagger.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2594,7 +2594,7 @@ paths:
25942594
}
25952595
tags:
25962596
- Query
2597-
/jpyx/incentive/params:
2597+
/botany/incentive/params:
25982598
get:
25992599
operationId: IncentiveParams
26002600
responses:
@@ -2606,7 +2606,7 @@ paths:
26062606
params:
26072607
type: object
26082608
properties:
2609-
jpyx_minting_reward_periods:
2609+
cdp_minting_reward_periods:
26102610
type: array
26112611
items:
26122612
type: object
@@ -2676,7 +2676,7 @@ paths:
26762676
format: byte
26772677
tags:
26782678
- Query
2679-
/jpyx/jsmndist/balances:
2679+
/botany/botanydist/balances:
26802680
get:
26812681
summary: 'this line is used by starport scaffolding # 2'
26822682
operationId: Balances
@@ -2727,9 +2727,9 @@ paths:
27272727
format: byte
27282728
tags:
27292729
- Query
2730-
/jpyx/jsmndist/params:
2730+
/botany/botanydist/params:
27312731
get:
2732-
operationId: JsmndistParams
2732+
operationId: BotanydistParams
27332733
responses:
27342734
'200':
27352735
description: A successful response.
@@ -4905,7 +4905,7 @@ definitions:
49054905
49064906
NOTE: The amount field is an Int which implements the custom method
49074907
signatures required by gogoproto.
4908-
jpyx.incentive.Multiplier:
4908+
botany.incentive.Multiplier:
49094909
type: object
49104910
properties:
49114911
name:
@@ -4915,10 +4915,10 @@ definitions:
49154915
format: int64
49164916
factor:
49174917
type: string
4918-
jpyx.incentive.Params:
4918+
botany.incentive.Params:
49194919
type: object
49204920
properties:
4921-
jpyx_minting_reward_periods:
4921+
cdp_minting_reward_periods:
49224922
type: array
49234923
items:
49244924
type: object
@@ -4963,13 +4963,13 @@ definitions:
49634963
claim_end:
49644964
type: string
49654965
format: date-time
4966-
jpyx.incentive.QueryParamsResponse:
4966+
botany.incentive.QueryParamsResponse:
49674967
type: object
49684968
properties:
49694969
params:
49704970
type: object
49714971
properties:
4972-
jpyx_minting_reward_periods:
4972+
cdp_minting_reward_periods:
49734973
type: array
49744974
items:
49754975
type: object
@@ -5014,7 +5014,7 @@ definitions:
50145014
claim_end:
50155015
type: string
50165016
format: date-time
5017-
jpyx.incentive.RewardPeriod:
5017+
botany.incentive.RewardPeriod:
50185018
type: object
50195019
properties:
50205020
active:
@@ -5039,7 +5039,7 @@ definitions:
50395039
50405040
NOTE: The amount field is an Int which implements the custom method
50415041
signatures required by gogoproto.
5042-
jpyx.jsmndist.Params:
5042+
botany.botanydist.Params:
50435043
type: object
50445044
properties:
50455045
active:
@@ -5057,7 +5057,7 @@ definitions:
50575057
format: date-time
50585058
inflation:
50595059
type: string
5060-
jpyx.jsmndist.Period:
5060+
botany.botanydist.Period:
50615061
type: object
50625062
properties:
50635063
start:
@@ -5068,7 +5068,7 @@ definitions:
50685068
format: date-time
50695069
inflation:
50705070
type: string
5071-
jpyx.jsmndist.QueryGetBalancesResponse:
5071+
botany.botanydist.QueryGetBalancesResponse:
50725072
type: object
50735073
properties:
50745074
balances:
@@ -5085,7 +5085,7 @@ definitions:
50855085
50865086
NOTE: The amount field is an Int which implements the custom method
50875087
signatures required by gogoproto.
5088-
jpyx.jsmndist.QueryParamsResponse:
5088+
botany.botanydist.QueryParamsResponse:
50895089
type: object
50905090
properties:
50915091
params:

0 commit comments

Comments
 (0)