Merge branch 'master' into marko/4698grpc_priv

node/codec.go

@@ -1,13 +0,0 @@
-package node
-
-import (
-	amino "github.com/tendermint/go-amino"
-
-	cryptoamino "github.com/tendermint/tendermint/crypto/encoding/amino"
-)
-
-var cdc = amino.NewCodec()
-
-func init() {
-	cryptoamino.RegisterAmino(cdc)
-}

node/node_test.go

@@ -232,7 +232,6 @@ func TestCreateProposalBlock(t *testing.T) {
 	mempool.SetLogger(logger)
 
 	// Make EvidencePool
-	types.RegisterMockEvidencesGlobal() // XXX!
 	evidenceDB := dbm.NewMemDB()
 	blockStore := store.NewBlockStore(dbm.NewMemDB())
 	evidencePool, err := evidence.NewPool(stateDB, evidenceDB, blockStore)