diff --git a/cmd/gaia/app/app.go b/cmd/gaia/app/app.go index fe47826896..59fb3a2090 100644 --- a/cmd/gaia/app/app.go +++ b/cmd/gaia/app/app.go @@ -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{})), } } diff --git a/examples/democoin/app/app.go b/examples/democoin/app/app.go index c0b8dd0922..d4c2a2ba3f 100644 --- a/examples/democoin/app/app.go +++ b/examples/democoin/app/app.go @@ -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), } } diff --git a/examples/democoin/x/cool/keeper.go b/examples/democoin/x/cool/keeper.go index 6a1f8da6d2..d594e29af6 100644 --- a/examples/democoin/x/cool/keeper.go +++ b/examples/democoin/x/cool/keeper.go @@ -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} } diff --git a/examples/democoin/x/cool/keeper_test.go b/examples/democoin/x/cool/keeper_test.go index 470efea0ab..7fa8009fdd 100644 --- a/examples/democoin/x/cool/keeper_test.go +++ b/examples/democoin/x/cool/keeper_test.go @@ -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"}) diff --git a/examples/democoin/x/pow/handler_test.go b/examples/democoin/x/pow/handler_test.go index 8a4f81de24..b6f568ee1b 100644 --- a/examples/democoin/x/pow/handler_test.go +++ b/examples/democoin/x/pow/handler_test.go @@ -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) diff --git a/examples/democoin/x/pow/keeper.go b/examples/democoin/x/pow/keeper.go index 4d95840b7b..398009a13b 100644 --- a/examples/democoin/x/pow/keeper.go +++ b/examples/democoin/x/pow/keeper.go @@ -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) diff --git a/examples/democoin/x/pow/keeper_test.go b/examples/democoin/x/pow/keeper_test.go index 015f98556d..23cad93f72 100644 --- a/examples/democoin/x/pow/keeper_test.go +++ b/examples/democoin/x/pow/keeper_test.go @@ -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)}) diff --git a/x/stake/handler.go b/x/stake/handler.go index 6c09b8d7c8..b1d58bf134 100644 --- a/x/stake/handler.go +++ b/x/stake/handler.go @@ -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)