certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

InitGenesis & WriteGenesis no longer functions of keepers

This commit is contained in:
Christopher Goes 2018-04-26 20:19:02 +02:00 committed by rigelrozanski
parent c788c3e533
commit 9450779bba
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/gaia/app/app.go
View File

@ -113,7 +113,7 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
}
// load the initial stake information
app.stakeKeeper.InitGenesis(ctx, genesisState.StakeData)
stake.InitGenesis(app.stakeKeeper, ctx, genesisState.StakeData)
return abci.ResponseInitChain{}
}
@ -122,6 +122,6 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
func (app *GaiaApp) ExportGenesis() GenesisState {
return GenesisState{
Accounts: []GenesisAccount{},
StakeData: app.stakeKeeper.WriteGenesis(app.NewContext(true, abci.Header{})),
StakeData: stake.WriteGenesis(app.stakeKeeper, app.NewContext(true, abci.Header{})),
}
}

8
examples/democoin/app/app.go
View File

@ -134,13 +134,13 @@ func (app *DemocoinApp) initChainerFn(coolKeeper cool.Keeper, powKeeper pow.Keep
}
// Application specific genesis handling
err = coolKeeper.InitGenesis(ctx, genesisState.CoolGenesis)
err = cool.InitGenesis(app.coolKeeper, ctx, genesisState.CoolGenesis)
if err != nil {
panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
// return sdk.ErrGenesisParse("").TraceCause(err, "")
}
err = powKeeper.InitGenesis(ctx, genesisState.POWGenesis)
err = pow.InitGenesis(app.powKeeper, ctx, genesisState.POWGenesis)
if err != nil {
panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
// return sdk.ErrGenesisParse("").TraceCause(err, "")
@ -155,7 +155,7 @@ func (app *DemocoinApp) ExportGenesis() types.GenesisState {
ctx := app.NewContext(true, abci.Header{})
return types.GenesisState{
Accounts: []*types.GenesisAccount{},
POWGenesis: app.powKeeper.WriteGenesis(ctx),
CoolGenesis: app.coolKeeper.WriteGenesis(ctx),
POWGenesis: pow.WriteGenesis(app.powKeeper, ctx),
CoolGenesis: cool.WriteGenesis(app.coolKeeper, ctx),
}
}

4
examples/democoin/x/cool/keeper.go
View File

@ -44,13 +44,13 @@ func (k Keeper) CheckTrend(ctx sdk.Context, guessedTrend string) bool {
}
// InitGenesis - store the genesis trend
func (k Keeper) InitGenesis(ctx sdk.Context, data Genesis) error {
func InitGenesis(k Keeper, ctx sdk.Context, data Genesis) error {
k.setTrend(ctx, data.Trend)
return nil
}
// WriteGenesis - output the genesis trend
func (k Keeper) WriteGenesis(ctx sdk.Context) Genesis {
func WriteGenesis(k Keeper, ctx sdk.Context) Genesis {
trend := k.GetTrend(ctx)
return Genesis{trend}
}

4
examples/democoin/x/cool/keeper_test.go
View File

@ -34,10 +34,10 @@ func TestCoolKeeper(t *testing.T) {
ck := bank.NewKeeper(am)
keeper := NewKeeper(capKey, ck, DefaultCodespace)
err := keeper.InitGenesis(ctx, Genesis{"icy"})
err := InitGenesis(keeper, ctx, Genesis{"icy"})
assert.Nil(t, err)
genesis := keeper.WriteGenesis(ctx)
genesis := WriteGenesis(keeper, ctx)
assert.Nil(t, err)
assert.Equal(t, genesis, Genesis{"icy"})

2
examples/democoin/x/pow/handler_test.go
View File

@ -30,7 +30,7 @@ func TestPowHandler(t *testing.T) {
count := uint64(1)
difficulty := uint64(2)
err := keeper.InitGenesis(ctx, Genesis{uint64(1), uint64(0)})
err := InitGenesis(keeper, ctx, Genesis{uint64(1), uint64(0)})
assert.Nil(t, err)
nonce, proof := mine(addr, count, difficulty)

4
examples/democoin/x/pow/keeper.go
View File

@ -37,14 +37,14 @@ func NewKeeper(key sdk.StoreKey, config Config, ck bank.Keeper, codespace sdk.Co
}
// InitGenesis for the POW module
func (k Keeper) InitGenesis(ctx sdk.Context, genesis Genesis) error {
func InitGenesis(k Keeper, ctx sdk.Context, genesis Genesis) error {
k.SetLastDifficulty(ctx, genesis.Difficulty)
k.SetLastCount(ctx, genesis.Count)
return nil
}
// WriteGenesis for the PoW module
func (k Keeper) WriteGenesis(ctx sdk.Context) Genesis {
func WriteGenesis(k Keeper, ctx sdk.Context) Genesis {
difficulty, err := k.GetLastDifficulty(ctx)
if err != nil {
panic(err)

4
examples/democoin/x/pow/keeper_test.go
View File

@ -37,10 +37,10 @@ func TestPowKeeperGetSet(t *testing.T) {
ck := bank.NewKeeper(am)
keeper := NewKeeper(capKey, config, ck, DefaultCodespace)
err := keeper.InitGenesis(ctx, Genesis{uint64(1), uint64(0)})
err := InitGenesis(keeper, ctx, Genesis{uint64(1), uint64(0)})
assert.Nil(t, err)
genesis := keeper.WriteGenesis(ctx)
genesis := WriteGenesis(keeper, ctx)
assert.Nil(t, err)
assert.Equal(t, genesis, Genesis{uint64(1), uint64(0)})

4
x/stake/handler.go
View File

@ -49,7 +49,7 @@ func NewEndBlocker(k Keeper) sdk.EndBlocker {
//_____________________________________________________________________
// InitGenesis - store genesis parameters
func (k Keeper) InitGenesis(ctx sdk.Context, data GenesisState) {
func InitGenesis(k Keeper, ctx sdk.Context, data GenesisState) {
k.setPool(ctx, data.Pool)
k.setParams(ctx, data.Params)
for _, candidate := range data.Candidates {
@ -61,7 +61,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data GenesisState) {
}
// WriteGenesis - output genesis parameters
func (k Keeper) WriteGenesis(ctx sdk.Context) GenesisState {
func WriteGenesis(k Keeper, ctx sdk.Context) GenesisState {
pool := k.GetPool(ctx)
params := k.GetParams(ctx)
candidates := k.GetCandidates(ctx, 32767)