Skip to content

Commit

Permalink
Merge pull request #143 from binance-chain/release/v0.25.0-binance.18
Browse files Browse the repository at this point in the history
Release/v0.25.0 binance.18
  • Loading branch information
yutianwu authored Jun 19, 2019
2 parents 05f8cc7 + eef6714 commit 8e2ea76
Show file tree
Hide file tree
Showing 44 changed files with 1,232 additions and 324 deletions.
98 changes: 62 additions & 36 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 13 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
name = "github.com/bgentry/speakeasy"
version = "~0.1.0"

[[override]]
name = "github.com/golang/protobuf"
version = "=1.1.0"

[[constraint]]
name = "github.com/mattn/go-isatty"
version = "~0.0.3"
Expand Down Expand Up @@ -54,12 +50,12 @@
[[override]]
name = "github.com/tendermint/iavl"
source = "github.com/binance-chain/bnc-tendermint-iavl"
version = "=v0.12.0-binance.0"
version = "=v0.12.0-binance.1"

[[override]]
name = "github.com/tendermint/tendermint"
source = "github.com/binance-chain/bnc-tendermint"
version = "=v0.30.1-binance.0"
version = "=v0.31.5-binance.0"

## deps without releases:

Expand All @@ -76,9 +72,18 @@
name = "github.com/cosmos/go-bip39"
revision = "52158e4697b87de16ed390e1bdaf813e581008fa"

[[override]]
name = "github.com/zondax/ledger-go"
source = "https://github.com/binance-chain/ledger-go"
version = "v0.9.1"

[[constraint]]
name = "github.com/zondax/ledger-goclient"
version = "=v0.1.0"
name = "github.com/zondax/ledger-cosmos-go"
source = "https://github.com/binance-chain/ledger-cosmos-go"
version = "v0.9.9-binance.1"
[[prune.project]]
name = "github.com/zondax/hid"
unused-packages = false

## transitive deps, with releases:

Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ godocs:
########################################
### Testing

test: test_unit
test:
make test_unit
make test_race
make test_sim_modules

test_cli:
@go test -count 1 -p 1 `go list github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test` -tags=cli_test
Expand Down
Loading

0 comments on commit 8e2ea76

Please sign in to comment.