Update deps, break on iavl proof changes

This commit is contained in:
Ethan Frey 2017-09-06 13:55:21 +02:00
parent f2ff547a8f
commit b869a999c3
3 changed files with 41 additions and 35 deletions

68
glide.lock generated
View File

@ -1,20 +1,22 @@
hash: 7ba2bf40f622c7b95538278cb615b267cf4b53dcda8d47489d250b09bc08d0b4
updated: 2017-08-22T13:09:54.55565241+02:00
hash: 8c26e55d658fbe1b9c7951833528b63613549a61149ca7e78e6de2d96f81f372
updated: 2017-09-06T13:54:19.419666453+02:00
imports:
- name: github.com/bgentry/speakeasy
version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
- name: github.com/btcsuite/btcd
version: 47885ab8702485be6b6f87a03d4f3be0bc5c982c
version: b8df516b4b267acf2de46be593a9d948d1d2c420
subpackages:
- btcec
- name: github.com/btcsuite/fastsha256
version: 637e656429416087660c84436a2a035d69d54e2e
- name: github.com/BurntSushi/toml
version: a368813c5e648fee92e5f6c30e3944ff9d5e8895
version: b26d9c308763d68093482582cea63d69be07a0f0
- name: github.com/ebuchman/fail-test
version: 95f809107225be108efcf10a3509e4ea6ceef3c4
- name: github.com/fsnotify/fsnotify
version: 4da3e2cfbabc9f751898f250b49f2439785783a1
- name: github.com/go-kit/kit
version: 69950137349e3e6781c1a54e4f7fd3803bd36765
version: d67bb4c202e3b91377d1079b110a6c9ce23ab2f8
subpackages:
- log
- log/level
@ -28,9 +30,9 @@ imports:
- name: github.com/go-playground/universal-translator
version: 71201497bace774495daed26a3874fd339e0b538
- name: github.com/go-stack/stack
version: 54be5f394ed2c3e19dac9134a40a95ba5a017f7b
version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
- name: github.com/golang/protobuf
version: 0a4f71a498b7c4812f64969510bcb4eca251e33a
version: 18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8
subpackages:
- proto
- ptypes/any
@ -43,7 +45,7 @@ imports:
- name: github.com/gorilla/mux
version: bcd8bc72b08df0f70df986b97f95590779502d31
- name: github.com/gorilla/websocket
version: a69d9f6de432e2c6b296a947d8a5ee88f68522cf
version: a91eba7f97777409bc2c443f5534d41dd20c5720
- name: github.com/hashicorp/hcl
version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca
subpackages:
@ -64,15 +66,19 @@ imports:
- name: github.com/kr/logfmt
version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
- name: github.com/magiconair/properties
version: be5ece7dd465ab0765a9682137865547526d1dfb
version: 51463bfca2576e06c62a8504b5c0f06d61312647
- name: github.com/mattn/go-isatty
version: 57fdcb988a5c543893cc61bce354a6e24ab70022
version: 9622e0cc9d8f9be434ca605520ff9a16808fee47
- name: github.com/mitchellh/mapstructure
version: d0303fe809921458f417bcf828397a65db30a7e4
version: cc8532a8e9a55ea36402aa21efdf403a60d34096
- name: github.com/pelletier/go-buffruneio
version: c37440a7cf42ac63b919c752ca73a85067e05992
- name: github.com/pelletier/go-toml
version: 4692b8f9babfc93db58cc592ba2689d8736781de
version: 13d49d4606eb801b8f01ae542b4afc4c6ee3d84a
- name: github.com/pkg/errors
version: 645ef00459ed84a119197bfb8d8205042c6df63d
- name: github.com/rcrowley/go-metrics
version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
- name: github.com/spf13/afero
version: 9be650865eab0c12963d8753212f4f9c66cdcf12
subpackages:
@ -80,13 +86,13 @@ imports:
- name: github.com/spf13/cast
version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4
- name: github.com/spf13/cobra
version: 4a7b7e65864c064d48dce82efbbfed2bdc0bf2aa
version: 4cdb38c072b86bf795d2c81de50784d9fdd6eb77
- name: github.com/spf13/jwalterweatherman
version: 0efa5202c04663c757d84f90f5219c1250baf94f
version: 8f07c835e5cc1450c082fe3a439cf87b0cbb2d99
- name: github.com/spf13/pflag
version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
- name: github.com/spf13/viper
version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2
- name: github.com/syndtr/goleveldb
version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4
subpackages:
@ -103,7 +109,7 @@ imports:
- leveldb/table
- leveldb/util
- name: github.com/tendermint/abci
version: 7f5f48b6b9ec3964de4b07b6c3cd05d7c91aeee5
version: f1094f760b80ed35d709ed446646b716ded7a6f2
subpackages:
- client
- example/dummy
@ -115,7 +121,7 @@ imports:
- edwards25519
- extra25519
- name: github.com/tendermint/go-crypto
version: 03d2b2446e8587f159e52070b1f1e0def971a2c7
version: 1bc8de4caa844f8b64c120e65b047898f22b7f3e
subpackages:
- cmd
- keys
@ -131,19 +137,19 @@ imports:
- data
- data/base58
- name: github.com/tendermint/light-client
version: b2afece9635d11e77dd404019b9cf3885d34f4e5
version: ac2e4bf47b31aaf5d3d336691ac786ec751bfc32
subpackages:
- certifiers
- certifiers/client
- certifiers/files
- proofs
- name: github.com/tendermint/merkleeyes
version: da3842e33b138b387aec3208c3044a936a0aac41
version: 2f6e5d31e7a35045d8d0a5895cb1fec33dd4d32b
subpackages:
- client
- iavl
- name: github.com/tendermint/tendermint
version: 2d4c86dfe8f78568abd8e3847ce703d2085ed929
version: aa78fc14b5824725f8a14dd2c2ad727a9ab89cc3
subpackages:
- blockchain
- cmd/tendermint/commands
@ -170,7 +176,7 @@ imports:
- types
- version
- name: github.com/tendermint/tmlibs
version: 956966e6587aa6b8dd3a375d35c3744291c38d60
version: bfec1ff1cd7fda9f5b2d8b570e3bec163e5f9149
subpackages:
- autofile
- cli
@ -184,7 +190,7 @@ imports:
- logger
- merkle
- name: golang.org/x/crypto
version: 7f7c0c2d75ebb4e32a21396ce36e87b6dadc91c9
version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e
subpackages:
- curve25519
- nacl/box
@ -195,7 +201,7 @@ imports:
- ripemd160
- salsa20/salsa
- name: golang.org/x/net
version: 02ac38e2528ff4adea90f184d71a3faa04b4b1b0
version: feeb485667d1fdabe727840fe00adc22431bc86e
subpackages:
- context
- http2
@ -205,22 +211,22 @@ imports:
- lex/httplex
- trace
- name: golang.org/x/sys
version: cd2c276457edda6df7fb04895d3fd6a6add42926
version: e62c3de784db939836898e5c19ffd41bece347da
subpackages:
- unix
- name: golang.org/x/text
version: 836efe42bb4aa16aaa17b9c155d8813d336ed720
version: 470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4
subpackages:
- secure/bidirule
- transform
- unicode/bidi
- unicode/norm
- name: google.golang.org/genproto
version: b0a3dcfcd1a9bd48e63634bd8802960804cf8315
version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
subpackages:
- googleapis/rpc/status
- name: google.golang.org/grpc
version: 71260d21715bff9c2ac999d546349d4f4b77ef1d
version: 844f573616520565fdc6fb4db242321b5456fd6d
subpackages:
- codes
- credentials
@ -236,12 +242,12 @@ imports:
- tap
- transport
- name: gopkg.in/go-playground/validator.v9
version: d529ee1b0f30352444f507cc6cdac96bfd12decc
version: 6d8c18553ea1ac493d049edd6f102f52e618f085
- name: gopkg.in/yaml.v2
version: eb3733d160e74a9c7e442f435eb3bea458e1d19f
version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
testImports:
- name: github.com/davecgh/go-spew
version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
subpackages:
- spew
- name: github.com/pmezard/go-difflib
@ -249,7 +255,7 @@ testImports:
subpackages:
- difflib
- name: github.com/stretchr/testify
version: 05e8a0eda380579888eb53c394909df027f06991
version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
subpackages:
- assert
- require

View File

@ -22,19 +22,19 @@ import:
subpackages:
- data
- package: github.com/tendermint/light-client
version: unstable
version: develop
subpackages:
- proofs
- certifiers
- certifiers/client
- certifiers/files
- package: github.com/tendermint/merkleeyes
version: origin/unstable
version: develop
subpackages:
- client
- iavl
- package: github.com/tendermint/tendermint
version: no-internet
version: develop
subpackages:
- config
- node

View File

@ -50,7 +50,7 @@ func (b *Bonsai) Remove(key []byte) (value []byte) {
return
}
func (b *Bonsai) GetWithProof(key []byte) ([]byte, *iavl.KeyExistsProof, *iavl.KeyNotExistsProof, error) {
func (b *Bonsai) GetWithProof(key []byte) ([]byte, iavl.KeyProof, error) {
return b.Tree.GetWithProof(key)
}