Merge PR cosmos#142: Delete keys package & Ledger integration; update…

… tests
liamsi · Jun 20, 2018 · edb36d3 · edb36d3
2 parents 4634063 + c7a842a
commit edb36d3
Show file tree

Hide file tree

Showing 23 changed files with 7 additions and 2,044 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -28,10 +28,6 @@
   name = "github.com/btcsuite/btcutil"
   branch = "master"
 
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
 [[constraint]]
   name = "github.com/stretchr/testify"
   version = "1.2.1"
@@ -48,14 +44,6 @@
   name = "github.com/tendermint/tmlibs"
   version = "0.8.1"
 
-[[constraint]]
-  name = "github.com/tyler-smith/go-bip39"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/zondax/ledger-goclient"
-  revision = "065cbf938a16f20335c40cfe180f9cd4955c6a5a"
-
 [prune]
   go-tests = true
   unused-packages = true
diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ get_vendor_deps:
 ### Testing
 
 test:
-	go test -p 1 $(shell go list ./... | grep -v vendor)
+	CGO_ENABLED=0 go test -p 1 $(shell go list ./... | grep -v vendor)
 
 ########################################
 ### Formatting, linting, and vetting

diff --git a/amino.go b/amino.go
@@ -28,8 +28,6 @@ func RegisterAmino(cdc *amino.Codec) {
 		"tendermint/PrivKeyEd25519", nil)
 	cdc.RegisterConcrete(PrivKeySecp256k1{},
 		"tendermint/PrivKeySecp256k1", nil)
-	cdc.RegisterConcrete(PrivKeyLedgerSecp256k1{},
-		"tendermint/PrivKeyLedgerSecp256k1", nil)
 
 	cdc.RegisterInterface((*Signature)(nil), nil)
 	cdc.RegisterConcrete(SignatureEd25519{},

diff --git a/encode_test.go b/encode_test.go
@@ -50,7 +50,6 @@ func ExamplePrintRegisteredTypes() {
 	//| PubKeySecp256k1 | tendermint/PubKeySecp256k1 | 0xEB5AE987 | 0x21 |  |
 	//| PrivKeyEd25519 | tendermint/PrivKeyEd25519 | 0xA3288910 | 0x40 |  |
 	//| PrivKeySecp256k1 | tendermint/PrivKeySecp256k1 | 0xE1B0F79B | 0x20 |  |
-	//| PrivKeyLedgerSecp256k1 | tendermint/PrivKeyLedgerSecp256k1 | 0x10CAB393 | variable |  |
 	//| SignatureEd25519 | tendermint/SignatureEd25519 | 0x2031EA53 | 0x40 |  |
 	//| SignatureSecp256k1 | tendermint/SignatureSecp256k1 | 0x7FC4A495 | variable |  |
 }

diff --git a/keys/bcrypt/base64.go b/keys/bcrypt/base64.go