Minor cleanup

This commit is contained in:
Christopher Goes 2018-04-26 18:07:13 +02:00 committed by rigelrozanski
parent f92e83d2e0
commit 724c1eced5
2 changed files with 25 additions and 13 deletions

View File

@ -15,6 +15,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/stake"
"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
"github.com/cosmos/cosmos-sdk/examples/democoin/x/simplestake"
)
const (
@ -32,6 +33,11 @@ type BasecoinApp struct {
keyIBC *sdk.KVStoreKey
keyStake *sdk.KVStoreKey
// keepers
coinKeeper bank.Keeper
ibcMapper ibc.Mapper
stakeKeeper simplestake.Keeper
// Manage getting and setting accounts
accountMapper sdk.AccountMapper
coinKeeper bank.Keeper
@ -122,5 +128,7 @@ func (app *BasecoinApp) initChainer(ctx sdk.Context, req abci.RequestInitChain)
// Custom logic for state export
func (app *BasecoinApp) ExportGenesis() types.GenesisState {
return types.GenesisState{}
return types.GenesisState{
Accounts: []*types.GenesisAccount{},
}
}

View File

@ -37,7 +37,11 @@ type DemocoinApp struct {
capKeyStakingStore *sdk.KVStoreKey
// keepers
powKeeper pow.Keeper
coinKeeper bank.Keeper
coolKeeper cool.Keeper
powKeeper pow.Keeper
ibcMapper ibc.Mapper
stakeKeeper simplestake.Keeper
// Manage getting and setting accounts
accountMapper sdk.AccountMapper
@ -67,21 +71,21 @@ func NewDemocoinApp(logger log.Logger, db dbm.DB) *DemocoinApp {
)
// Add handlers.
coinKeeper := bank.NewKeeper(app.accountMapper)
coolKeeper := cool.NewKeeper(app.capKeyMainStore, coinKeeper, app.RegisterCodespace(cool.DefaultCodespace))
app.powKeeper = pow.NewKeeper(app.capKeyPowStore, pow.NewConfig("pow", int64(1)), coinKeeper, app.RegisterCodespace(pow.DefaultCodespace))
ibcMapper := ibc.NewMapper(app.cdc, app.capKeyIBCStore, app.RegisterCodespace(ibc.DefaultCodespace))
stakeKeeper := simplestake.NewKeeper(app.capKeyStakingStore, coinKeeper, app.RegisterCodespace(simplestake.DefaultCodespace))
app.coinKeeper = bank.NewKeeper(app.accountMapper)
app.coolKeeper = cool.NewKeeper(app.capKeyMainStore, app.coinKeeper, app.RegisterCodespace(cool.DefaultCodespace))
app.powKeeper = pow.NewKeeper(app.capKeyPowStore, pow.NewConfig("pow", int64(1)), app.coinKeeper, app.RegisterCodespace(pow.DefaultCodespace))
app.ibcMapper = ibc.NewMapper(app.cdc, app.capKeyIBCStore, app.RegisterCodespace(ibc.DefaultCodespace))
app.stakeKeeper = simplestake.NewKeeper(app.capKeyStakingStore, app.coinKeeper, app.RegisterCodespace(simplestake.DefaultCodespace))
app.Router().
AddRoute("bank", bank.NewHandler(coinKeeper)).
AddRoute("cool", cool.NewHandler(coolKeeper)).
AddRoute("bank", bank.NewHandler(app.coinKeeper)).
AddRoute("cool", cool.NewHandler(app.coolKeeper)).
AddRoute("pow", app.powKeeper.Handler).
AddRoute("sketchy", sketchy.NewHandler()).
AddRoute("ibc", ibc.NewHandler(ibcMapper, coinKeeper)).
AddRoute("simplestake", simplestake.NewHandler(stakeKeeper))
AddRoute("ibc", ibc.NewHandler(app.ibcMapper, app.coinKeeper)).
AddRoute("simplestake", simplestake.NewHandler(app.stakeKeeper))
// Initialize BaseApp.
app.SetInitChainer(app.initChainerFn(coolKeeper, app.powKeeper))
app.SetInitChainer(app.initChainerFn(app.coolKeeper, app.powKeeper))
app.MountStoresIAVL(app.capKeyMainStore, app.capKeyAccountStore, app.capKeyPowStore, app.capKeyIBCStore, app.capKeyStakingStore)
app.SetAnteHandler(auth.NewAnteHandler(app.accountMapper, auth.BurnFeeHandler))
err := app.LoadLatestVersion(app.capKeyMainStore)
@ -152,6 +156,6 @@ func (app *DemocoinApp) ExportGenesis() types.GenesisState {
return types.GenesisState{
Accounts: []*types.GenesisAccount{},
POWGenesis: app.powKeeper.WriteGenesis(ctx),
CoolGenesis: cool.Genesis{},
CoolGenesis: app.coolKeeper.WriteGenesis(ctx),
}
}