Merge branch 'master' into marko/remove-apphash

node/node_test.go

@@ -562,7 +562,6 @@ func state(nVals int, height int64) (sm.State, dbm.DB, []types.PrivValidator) {
 	s, _ := sm.MakeGenesisState(&types.GenesisDoc{
 		ChainID:    "test-chain",
 		Validators: vals,
-		AppHash:    nil,
 	})
 
 	// save validators to db for 2 heights

state/helpers_test.go

@@ -112,7 +112,6 @@ func makeState(nVals, height int) (sm.State, dbm.DB, map[string]types.PrivValida
 	s, _ := sm.MakeGenesisState(&types.GenesisDoc{
 		ChainID:    chainID,
 		Validators: vals,
-		AppHash:    nil,
 	})
 
 	stateDB := dbm.NewMemDB()

state/state.go

@@ -370,6 +370,6 @@ func MakeGenesisState(genDoc *types.GenesisDoc) (State, error) {
 		ConsensusParams:                  *genDoc.ConsensusParams,
 		LastHeightConsensusParamsChanged: genDoc.InitialHeight,
 
-		AppHash: genDoc.AppHash,
+		AppHash: []byte(""),
 	}, nil
 }

types/genesis.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/tendermint/tendermint/crypto"
-	tmbytes "github.com/tendermint/tendermint/libs/bytes"
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	tmtime "github.com/tendermint/tendermint/types/time"
 )
@@ -40,7 +39,6 @@ type GenesisDoc struct {
 	InitialHeight   int64              `json:"initial_height"`
 	ConsensusParams *ConsensusParams   `json:"consensus_params,omitempty"`
 	Validators      []GenesisValidator `json:"validators,omitempty"`
-	AppHash         tmbytes.HexBytes   `json:"app_hash"`
 	AppState        json.RawMessage    `json:"app_state,omitempty"`
 }
 

types/genesis_test.go

@@ -70,7 +70,6 @@ func TestGenesisGood(t *testing.T) {
 				"power":"10",
 				"name":""
 			}],
-			"app_hash":"",
 			"app_state":{"account_owner": "Bob"}
 		}`,
 	)
@@ -160,6 +159,5 @@ func randomGenesisDoc() *GenesisDoc {
 		InitialHeight:   1000,
 		Validators:      []GenesisValidator{{pubkey.Address(), pubkey, 10, "myval"}},
 		ConsensusParams: DefaultConsensusParams(),
-		AppHash:         []byte{1, 2, 3},
 	}
 }