From 762d1dd6bde2f1f7a41eada2b05f4aa3fa8fdad1 Mon Sep 17 00:00:00 2001 From: Wenchao Hu Date: Mon, 28 Oct 2019 14:35:04 +0800 Subject: [PATCH] chore: change overlord dependency to rev (#35) * change overlord dependency to rev * update merkle --- Cargo.lock | 26 +++++++------------------- common/merkle/Cargo.toml | 2 +- core/consensus/Cargo.toml | 2 +- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e33bfe047..d1de1c216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "protocol 0.1.0", "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "static_merkle_tree 1.0.0 (git+https://github.com/yejiayu/static-merkle-tree.git?branch=trait_scope)", + "static_merkle_tree 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -457,7 +457,7 @@ dependencies = [ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "overlord 0.1.0 (git+https://github.com/cryptape/overlord.git?branch=dev)", + "overlord 0.1.0 (git+https://github.com/cryptape/overlord.git?rev=10ce94a0)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "protocol 0.1.0", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1458,16 +1458,6 @@ dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "log-json" -version = "0.1.0" -source = "git+https://github.com/KaoImin/log-json.git#2034a541baaf30a3471c5a0a0795e6a99b4bd757" -dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mach_o_sys" version = "0.1.1" @@ -1794,7 +1784,7 @@ dependencies = [ [[package]] name = "overlord" version = "0.1.0" -source = "git+https://github.com/cryptape/overlord.git?branch=dev#89e5876833b44eda9d31b084751b5fb066b43415" +source = "git+https://github.com/cryptape/overlord.git?rev=10ce94a0#10ce94a06211724febe35f5f500b051ea1ff03f7" dependencies = [ "async-trait 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "bit-vec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1806,7 +1796,6 @@ dependencies = [ "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log-json 0.1.0 (git+https://github.com/KaoImin/log-json.git)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2804,8 +2793,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "static_merkle_tree" -version = "1.0.0" -source = "git+https://github.com/yejiayu/static-merkle-tree.git?branch=trait_scope#5b285e5aecdf56d8249d2839379b717676e10672" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "stream-cipher" @@ -3831,7 +3820,6 @@ dependencies = [ "checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum log-json 0.1.0 (git+https://github.com/KaoImin/log-json.git)" = "" "checksum mach_o_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3e854583a83f20cf329bb9283366335387f7db59d640d1412167e05fedb98826" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" @@ -3863,7 +3851,7 @@ dependencies = [ "checksum ophelia-derive 0.1.0 (git+https://github.com/zeroqn/ophelia.git)" = "" "checksum ophelia-hasher 0.1.0 (git+https://github.com/zeroqn/ophelia.git)" = "" "checksum ophelia-secp256k1 0.1.0 (git+https://github.com/zeroqn/ophelia.git)" = "" -"checksum overlord 0.1.0 (git+https://github.com/cryptape/overlord.git?branch=dev)" = "" +"checksum overlord 0.1.0 (git+https://github.com/cryptape/overlord.git?rev=10ce94a0)" = "" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum pairing 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ceda21136251c6d5a422d3d798d8ac22515a6e8d3521bb60c59a8349d36d0d57" @@ -3969,7 +3957,7 @@ dependencies = [ "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" -"checksum static_merkle_tree 1.0.0 (git+https://github.com/yejiayu/static-merkle-tree.git?branch=trait_scope)" = "" +"checksum static_merkle_tree 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "773abf52222c716fcf9ea6dc1e16c7c1e5d72c0aafaf278a70750666bf9ca041" "checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" "checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" "checksum stringreader 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "913e7b03d63752f6cdd2df77da36749d82669904798fe8944b9ec3d23f159905" diff --git a/common/merkle/Cargo.toml b/common/merkle/Cargo.toml index 4da0f1525..adc7ed1ca 100644 --- a/common/merkle/Cargo.toml +++ b/common/merkle/Cargo.toml @@ -10,4 +10,4 @@ edition = "2018" bytes = "0.4" protocol = { path = "../../protocol" } rayon = "1.0" -static_merkle_tree = { git = "https://github.com/yejiayu/static-merkle-tree.git", branch = "trait_scope" } +static_merkle_tree = "1.1.0" diff --git a/core/consensus/Cargo.toml b/core/consensus/Cargo.toml index 2dd94b4e1..0a454a0e1 100644 --- a/core/consensus/Cargo.toml +++ b/core/consensus/Cargo.toml @@ -13,7 +13,7 @@ bytes = "0.4" creep = "0.1" derive_more = "0.15" futures-preview = "0.3.0-alpha.19" -overlord = { git = "https://github.com/cryptape/overlord.git", branch = "dev" } +overlord = { git = "https://github.com/cryptape/overlord.git", rev = "10ce94a0" } parking_lot = "0.9" rlp = "0.4" serde = {version = "1.0", features = ["derive"]}