Skip to content

Commit

Permalink
Merge #2206
Browse files Browse the repository at this point in the history
2206: chore: tweak cargo dependencies version, remove some duplicate crates r=yangby-cryptape,driftluo,zhangsoledad a=quake



Co-authored-by: quake <quake.wang@gmail.com>
  • Loading branch information
bors[bot] and quake committed Aug 4, 2020
2 parents d812102 + e035b18 commit 2eeb7f4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 37 deletions.
40 changes: 7 additions & 33 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion network/Cargo.toml
Expand Up @@ -23,7 +23,7 @@ bs58 = "0.3.0"
sentry = "0.16.0"
faster-hex = "0.4"
ckb-hash = {path = "../util/hash"}
secp256k1 = {version = "0.15.0", features = ["recovery"] }
secp256k1 = {version = "0.17", features = ["recovery"] }
resolve = "0.2.0"
num_cpus = "1.10"
snap = "0.2"
Expand Down
2 changes: 1 addition & 1 deletion script/Cargo.toml
Expand Up @@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
ckb-error = { path = "../error" }
failure = "0.1.5"
ckb-chain-spec = { path = "../spec" }
goblin = "0.1.3"
goblin = "0.2"
ckb-vm-definitions = "0.19.1"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
Expand Up @@ -7,7 +7,7 @@ edition = "2018"

[dependencies]
parking_lot = "=0.7.1"
linked-hash-map = { git = "https://github.com/nervosnetwork/linked-hash-map", rev = "df27f21" }
linked-hash-map = "0.5"

[dev-dependencies]
ckb-fixed-hash = { path = "fixed-hash" }
Expand Down
2 changes: 1 addition & 1 deletion util/crypto/Cargo.toml
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
ckb-fixed-hash = { path = "../fixed-hash" }
lazy_static = "1.3"
secp256k1 = { version = "0.17.0", features = ["recovery"], optional = true }
secp256k1 = { version = "0.17", features = ["recovery"], optional = true }
failure = "0.1.5"
rand = "0.6"
faster-hex = "0.4"
Expand Down

0 comments on commit 2eeb7f4

Please sign in to comment.