Merge PR #1367: Set ChainID on InitChain

* Added chain-id to context in InitChain
* Fix bug in test
* fmt
* Appease linter
* updated changelog
* Remove chainID hack
* setCheckState in InitChain
* Fix bug
* Fix initialization errors in example tests
* Initialize app tests with default stake genesis
* fix comments

examples/basecoin/app/app_test.go

@@ -2,7 +2,9 @@ package app
 
 import (
 	"os"
+	"fmt"
 	"testing"
+	"encoding/json"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -12,6 +14,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/stake"
+	gen "github.com/cosmos/cosmos-sdk/x/stake/types"
 
 	abci "github.com/tendermint/abci/types"
 	crypto "github.com/tendermint/go-crypto"
@@ -71,6 +74,16 @@ func TestGenesis(t *testing.T) {
 
 	// reload app and ensure the account is still there
 	bapp = NewBasecoinApp(logger, db)
+	// Initialize stake data with default genesis state
+	stakedata := gen.DefaultGenesisState()
+	genState, err := json.Marshal(stakedata)
+	if err != nil {
+		panic(err)
+	}
+
+	// InitChain with default stake data. Initializes deliverState and checkState context
+	bapp.InitChain(abci.RequestInitChain{AppStateBytes: []byte(fmt.Sprintf("{\"stake\": %s}", string(genState)))})
+	
 	ctx = bapp.BaseApp.NewContext(true, abci.Header{})
 	res1 = bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
 	assert.Equal(t, acc, res1)

examples/democoin/app/app_test.go

@@ -55,6 +55,7 @@ func TestGenesis(t *testing.T) {
 
 	// reload app and ensure the account is still there
 	bapp = NewDemocoinApp(logger, db)
+	bapp.InitChain(abci.RequestInitChain{AppStateBytes: []byte("{}")})
 	ctx = bapp.BaseApp.NewContext(true, abci.Header{})
 	res1 = bapp.accountMapper.GetAccount(ctx, baseAcc.Address)
 	assert.Equal(t, acc, res1)