Merge pull request cosmos#64 from tendermint/sdk2

Merge sdk2 into develop
liamsi · Feb 3, 2018 · 4542cc5 · 4542cc5
2 parents 67a47e6 + 45b71f7
commit 4542cc5
Show file tree

Hide file tree

Showing 25 changed files with 499 additions and 894 deletions.
diff --git a/nano/keys.go → _nano/keys.go b/nano/keys.go → _nano/keys.go
diff --git a/nano/keys_test.go → _nano/keys_test.go b/nano/keys_test.go → _nano/keys_test.go
diff --git a/nano/sign.go → _nano/sign.go b/nano/sign.go → _nano/sign.go
diff --git a/nano/sign_test.go → _nano/sign_test.go b/nano/sign_test.go → _nano/sign_test.go
diff --git a/crypto.go b/crypto.go
diff --git a/embed_test.go b/embed_test.go
diff --git a/encode_test.go b/encode_test.go
@@ -1,5 +1,8 @@
 package crypto
 
+/*
+XXX Needs to be refactored to not use go-wire/data
+
 import (
 	"fmt"
 	"strings"
@@ -179,3 +182,4 @@ func TestEmbededWireEncodings(t *testing.T) {
 		checkWire(t, msg, &msg2, tc.keyType, tc.size)
 	}
 }
+*/
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -6,38 +6,29 @@ 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/howeyc/crc16
+- package: github.com/pkg/errors
+  version: ^0.8.0
 - package: github.com/tendermint/ed25519
   subpackages:
   - extra25519
-- package: github.com/tendermint/tmlibs
-  version: sdk2
 - package: github.com/tendermint/go-wire
   version: develop
+- package: github.com/tendermint/tmlibs
+  version: cbc63518e589d6b0069f9750127fa83dd6ea5ee3
   subpackages:
-  - data
-  - data/base58
+  - common
+  - db
 - package: golang.org/x/crypto
   subpackages:
   - blowfish
   - nacl/secretbox
   - openpgp/armor
   - ripemd160
-- package: github.com/pkg/errors
-- package: github.com/howeyc/crc16
-- package: github.com/ethanfrey/ledger
 testImport:
-- package: github.com/mndrix/btcutil
 - package: github.com/stretchr/testify
-  version: ^1.1.4
+  version: ^1.2.1
   subpackages:
   - assert
   - require
-- package: github.com/tyler-smith/go-bip32
 - package: github.com/tyler-smith/go-bip39