Merge pull request cosmos#51 from tendermint/keystore

Keybase
liamsi · Nov 29, 2017 · 468c418 · 468c418
2 parents b4f04f1 + 086e1f6
commit 468c418
Show file tree

Hide file tree

Showing 24 changed files with 461 additions and 1,176 deletions.
diff --git a/Makefile b/Makefile
@@ -56,11 +56,12 @@ metalinter_test: ensure_tools
 		--enable=structcheck \
 	   	--enable=unconvert \
 		--enable=unused \
-		--enable=vetshadow \
 		--enable=vet \
 		--enable=varcheck \
+		--enable=vetshadow \
 		./...
 
+
 		#--enable=dupl \
 		#--enable=errcheck \
 		#--enable=goimports \

diff --git a/encode_test.go b/encode_test.go
@@ -145,8 +145,6 @@ func (s SigMessage) Bytes() []byte {
 }
 
 func TestEmbededWireEncodings(t *testing.T) {
-	assert := assert.New(t)
-
 	cases := []struct {
 		privKey PrivKey
 		keyType byte
@@ -171,7 +169,7 @@ func TestEmbededWireEncodings(t *testing.T) {
 	for i, tc := range cases {
 		pubKey := tc.privKey.PubKey()
 		sig := tc.privKey.Sign(payload)
-		assert.True(pubKey.VerifyBytes(payload, sig), "%d", i)
+		assert.True(t, pubKey.VerifyBytes(payload, sig), "%d", i)
 
 		msg := SigMessage{
 			Key: pubKey,

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -6,11 +6,18 @@ import:
 - package: github.com/btcsuite/btcutil
   subpackages:
   - base58
+- package: github.com/syndtr/goleveldb
+  subpackages:
+  - leveldb
+  - leveldb/errors
+  - leveldb/iterator
+  - leveldb/opt
+  - leveldb/util
 - package: github.com/tendermint/ed25519
   subpackages:
   - extra25519
 - package: github.com/tendermint/tmlibs
-  version: develop
+  version: sdk-develop
 - package: github.com/tendermint/go-wire
   version: develop
   subpackages:

diff --git a/keys/cryptostore/docs.go b/keys/cryptostore/docs.go
diff --git a/keys/cryptostore/enc_storage.go b/keys/cryptostore/enc_storage.go
diff --git a/keys/cryptostore/encoder.go b/keys/cryptostore/encoder.go
diff --git a/keys/cryptostore/encoder_test.go b/keys/cryptostore/encoder_test.go