stake init overhaul

examples/basecoin/app/app.go

@@ -1,8 +1,6 @@
 package app
 
 import (
-	"encoding/json"
-
 	abci "github.com/tendermint/abci/types"
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
@@ -133,7 +131,7 @@ func (app *BasecoinApp) initChainer(ctx sdk.Context, req abci.RequestInitChain)
 	stateJSON := req.AppStateBytes
 
 	genesisState := new(types.GenesisState)
-	err := json.Unmarshal(stateJSON, genesisState)
+	err := app.cdc.UnmarshalJSON(stateJSON, genesisState)
 	if err != nil {
 		panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
 		// return sdk.ErrGenesisParse("").TraceCause(err, "")

examples/basecoin/cmd/basecoind/main.go

@@ -25,7 +25,7 @@ func main() {
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
-	server.AddCommands(ctx, cdc, rootCmd, server.SimpleGenAppParams, generateApp)
+	server.AddCommands(ctx, cdc, rootCmd, server.DefaultAppInit, generateApp)
 
 	// prepare and add flags
 	rootDir := os.ExpandEnv("$HOME/.basecoind")

examples/democoin/app/app.go

@@ -1,8 +1,6 @@
 package app
 
 import (
-	"encoding/json"
-
 	abci "github.com/tendermint/abci/types"
 	cmn "github.com/tendermint/tmlibs/common"
 	dbm "github.com/tendermint/tmlibs/db"
@@ -147,7 +145,7 @@ func (app *DemocoinApp) initChainerFn(coolKeeper cool.Keeper, powKeeper pow.Keep
 		stateJSON := req.AppStateBytes
 
 		genesisState := new(types.GenesisState)
-		err := json.Unmarshal(stateJSON, genesisState)
+		err := app.cdc.UnmarshalJSON(stateJSON, genesisState)
 		if err != nil {
 			panic(err) // TODO https://github.com/cosmos/cosmos-sdk/issues/468
 			// return sdk.ErrGenesisParse("").TraceCause(err, "")

examples/democoin/cmd/democoind/main.go

@@ -19,6 +19,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/wire"
 )
 
+// init parameters
+var CoolAppInit = server.AppInit{
+	GenAppParams: CoolGenAppParams,
+}
+
 // coolGenAppParams sets up the app_state and appends the cool app state
 func CoolGenAppParams(cdc *wire.Codec, pubKey crypto.PubKey) (chainID string, validators []tmtypes.GenesisValidator, appState, cliPrint json.RawMessage, err error) {
 	chainID, validators, appState, cliPrint, err = server.SimpleGenAppParams(cdc, pubKey)
@@ -52,7 +57,7 @@ func main() {
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
-	server.AddCommands(ctx, cdc, rootCmd, CoolGenAppParams, generateApp)
+	server.AddCommands(ctx, cdc, rootCmd, CoolAppInit, generateApp)
 
 	// prepare and add flags
 	rootDir := os.ExpandEnv("$HOME/.democoind")