Reorder parameters & remove redundant check

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
-	stake.InitGenesis(app.stakeKeeper, ctx, genesisState.StakeData)
+	stake.InitGenesis(ctx, app.stakeKeeper, 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: stake.WriteGenesis(app.stakeKeeper, app.NewContext(true, abci.Header{})),
+		StakeData: stake.WriteGenesis(app.NewContext(true, abci.Header{}), app.stakeKeeper),
 	}
 }

cmd/gaia/cmd/gaiad/main.go

@@ -37,8 +37,8 @@ func generateApp(rootDir string, logger log.Logger) (abci.Application, error) {
 	if err != nil {
 		return nil, err
 	}
-	bapp := app.NewGaiaApp(logger, db)
+	gapp := app.NewGaiaApp(logger, db)
-	return bapp, nil
+	return gapp, nil
 }
 
 func exportApp(rootDir string, logger log.Logger) (interface{}, *wire.Codec, error) {
@@ -47,9 +47,6 @@ func exportApp(rootDir string, logger log.Logger) (interface{}, *wire.Codec, err
 	if err != nil {
 		return nil, nil, err
 	}
-	bapp := app.NewGaiaApp(log.NewNopLogger(), db)
+	gapp := app.NewGaiaApp(log.NewNopLogger(), db)
-	if err != nil {
+	return gapp.ExportGenesis(), app.MakeCodec(), nil
-		return nil, nil, err
-	}
-	return bapp.ExportGenesis(), app.MakeCodec(), nil
 }

examples/democoin/app/app.go

@@ -134,13 +134,13 @@ func (app *DemocoinApp) initChainerFn(coolKeeper cool.Keeper, powKeeper pow.Keep
 		}
 
 		// Application specific genesis handling
-		err = cool.InitGenesis(app.coolKeeper, ctx, genesisState.CoolGenesis)
+		err = cool.InitGenesis(ctx, app.coolKeeper, genesisState.CoolGenesis)
 		if err != nil {
 			panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
 			//	return sdk.ErrGenesisParse("").TraceCause(err, "")
 		}
 
-		err = pow.InitGenesis(app.powKeeper, ctx, genesisState.POWGenesis)
+		err = pow.InitGenesis(ctx, app.powKeeper, 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:  pow.WriteGenesis(app.powKeeper, ctx),
+		POWGenesis:  pow.WriteGenesis(ctx, app.powKeeper),
-		CoolGenesis: cool.WriteGenesis(app.coolKeeper, ctx),
+		CoolGenesis: cool.WriteGenesis(ctx, app.coolKeeper),
 	}
 }

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 InitGenesis(k Keeper, ctx sdk.Context, data Genesis) error {
+func InitGenesis(ctx sdk.Context, k Keeper, data Genesis) error {
 	k.setTrend(ctx, data.Trend)
 	return nil
 }
 
 // WriteGenesis - output the genesis trend
-func WriteGenesis(k Keeper, ctx sdk.Context) Genesis {
+func WriteGenesis(ctx sdk.Context, k Keeper) Genesis {
 	trend := k.GetTrend(ctx)
 	return Genesis{trend}
 }

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 := InitGenesis(keeper, ctx, Genesis{"icy"})
+	err := InitGenesis(ctx, keeper, Genesis{"icy"})
 	assert.Nil(t, err)
 
-	genesis := WriteGenesis(keeper, ctx)
+	genesis := WriteGenesis(ctx, keeper)
 	assert.Nil(t, err)
 	assert.Equal(t, genesis, Genesis{"icy"})
 

examples/democoin/x/pow/handler_test.go

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

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 InitGenesis(k Keeper, ctx sdk.Context, genesis Genesis) error {
+func InitGenesis(ctx sdk.Context, k Keeper, genesis Genesis) error {
 	k.SetLastDifficulty(ctx, genesis.Difficulty)
 	k.SetLastCount(ctx, genesis.Count)
 	return nil
 }
 
 // WriteGenesis for the PoW module
-func WriteGenesis(k Keeper, ctx sdk.Context) Genesis {
+func WriteGenesis(ctx sdk.Context, k Keeper) Genesis {
 	difficulty, err := k.GetLastDifficulty(ctx)
 	if err != nil {
 		panic(err)

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 := InitGenesis(keeper, ctx, Genesis{uint64(1), uint64(0)})
+	err := InitGenesis(ctx, keeper, Genesis{uint64(1), uint64(0)})
 	assert.Nil(t, err)
 
-	genesis := WriteGenesis(keeper, ctx)
+	genesis := WriteGenesis(ctx, keeper)
 	assert.Nil(t, err)
 	assert.Equal(t, genesis, Genesis{uint64(1), uint64(0)})
 

x/stake/handler.go

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