Merge branch 'develop' into jae/literefactor4

2026-09-18 22:14:35 +00:00 · 2018-07-23 23:28:14 -04:00
parent f1093edbe2 b92860b6c4
commit ea31c4836a
342 changed files with 30690 additions and 6538 deletions
@@ -2,11 +2,11 @@ package commands

 import (
 	"github.com/tendermint/go-amino"
-	"github.com/tendermint/tendermint/crypto"
+	cryptoAmino "github.com/tendermint/tendermint/crypto/encoding/amino"
 )

 var cdc = amino.NewCodec()

 func init() {
-	crypto.RegisterAmino(cdc)
+	cryptoAmino.RegisterAmino(cdc)
 }