Merge pull request #7 from HaoyangLiu/branch_v0.22.6-iris1

Hotfix: IRISHUB-304
irisnet · Sep 5, 2018 · bc9a42a · bc9a42a
2 parents fb697db + 952ac8b
commit bc9a42a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/blockchain/wire.go b/blockchain/wire.go
@@ -3,11 +3,13 @@ package blockchain
 import (
 	"github.com/tendermint/go-amino"
 	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
 
 func init() {
 	RegisterBlockchainMessages(cdc)
 	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterEvidences(cdc)
 }
diff --git a/consensus/types/wire.go b/consensus/types/wire.go
@@ -3,10 +3,12 @@ package types
 import (
 	"github.com/tendermint/go-amino"
 	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
 
 func init() {
 	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterEvidences(cdc)
 }
diff --git a/consensus/wire.go b/consensus/wire.go
@@ -3,6 +3,7 @@ package consensus
 import (
 	"github.com/tendermint/go-amino"
 	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
+	"github.com/tendermint/tendermint/types"
 )
 
 var cdc = amino.NewCodec()
@@ -11,4 +12,5 @@ func init() {
 	RegisterConsensusMessages(cdc)
 	RegisterWALMessages(cdc)
 	cryptoAmino.RegisterAmino(cdc)
+	types.RegisterEvidences(cdc)
 }
diff --git a/types/wire.go b/types/wire.go
@@ -9,4 +9,5 @@ var cdc = amino.NewCodec()
 
 func init() {
 	cryptoAmino.RegisterAmino(cdc)
+	RegisterEvidences(cdc)
 }