From d8e293b1a5e0fc79d040d756a8607190555b4988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BC=82=E6=B5=81?= Date: Sat, 22 Aug 2020 17:07:16 +0800 Subject: [PATCH] Revert "chore(deps): bump crossbeam-channel from 0.3.9 to 0.4.3" --- Cargo.lock | 35 +++++++++++++++++++++------------- chain/Cargo.toml | 2 +- ckb-bin/Cargo.toml | 2 +- miner/Cargo.toml | 2 +- network/Cargo.toml | 2 +- notify/Cargo.toml | 2 +- rpc/Cargo.toml | 2 +- sync/Cargo.toml | 2 +- test/Cargo.toml | 2 +- tx-pool/Cargo.toml | 2 +- util/logger-service/Cargo.toml | 2 +- util/stop-handler/Cargo.toml | 2 +- util/types/Cargo.toml | 2 +- verification/Cargo.toml | 2 +- 14 files changed, 35 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b26732deb7..f1d08b00e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ dependencies = [ "ckb-util", "ckb-verification", "clap", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "ctrlc", "rayon", "sentry", @@ -436,7 +436,7 @@ dependencies = [ "ckb-tx-pool", "ckb-types", "ckb-verification", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "faketime", "lazy_static", ] @@ -660,7 +660,7 @@ dependencies = [ "chrono", "ckb-logger-config", "ckb-util", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "env_logger", "lazy_static", "log 0.4.11", @@ -727,7 +727,7 @@ dependencies = [ "ckb-stop-handler", "ckb-types", "console", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "eaglesong", "failure", "futures 0.1.29", @@ -762,7 +762,7 @@ dependencies = [ "ckb-types", "ckb-util", "criterion", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "faketime", "faster-hex 0.4.1", "futures 0.3.4", @@ -810,7 +810,7 @@ dependencies = [ "ckb-logger", "ckb-stop-handler", "ckb-types", - "crossbeam-channel", + "crossbeam-channel 0.3.9", ] [[package]] @@ -935,7 +935,7 @@ dependencies = [ "ckb-types", "ckb-util", "ckb-verification", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "failure", "faketime", "futures 0.1.29", @@ -1026,7 +1026,7 @@ name = "ckb-stop-handler" version = "0.36.0-pre" dependencies = [ "ckb-logger", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "futures 0.1.29", "parking_lot 0.7.1", "tokio 0.2.22", @@ -1069,7 +1069,7 @@ dependencies = [ "ckb-types", "ckb-util", "ckb-verification", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "failure", "faketime", "futures 0.3.4", @@ -1135,7 +1135,7 @@ dependencies = [ "ckb-types", "ckb-util", "ckb-verification", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "failure", "faketime", "lru-cache", @@ -1153,7 +1153,7 @@ dependencies = [ "ckb-hash", "ckb-occupied-capacity", "ckb-rational", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "failure", "merkle-cbt", "molecule", @@ -1192,7 +1192,7 @@ dependencies = [ "ckb-test-chain-utils", "ckb-traits", "ckb-types", - "crossbeam-channel", + "crossbeam-channel 0.3.9", "enum-display-derive", "failure", "faketime", @@ -1399,13 +1399,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ "cfg-if", - "crossbeam-channel", + "crossbeam-channel 0.4.3", "crossbeam-deque", "crossbeam-epoch 0.8.2", "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", ] +[[package]] +name = "crossbeam-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +dependencies = [ + "crossbeam-utils 0.6.5", +] + [[package]] name = "crossbeam-channel" version = "0.4.3" diff --git a/chain/Cargo.toml b/chain/Cargo.toml index bd30690349..06f4cdad76 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -14,7 +14,7 @@ ckb-chain-spec = { path = "../spec" } ckb-store = { path = "../store" } ckb-verification = { path = "../verification" } faketime = "0.2.0" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ckb-stop-handler = { path = "../util/stop-handler" } ckb-dao = { path = "../util/dao" } ckb-proposal-table = { path = "../util/proposal-table" } diff --git a/ckb-bin/Cargo.toml b/ckb-bin/Cargo.toml index 586907c98e..0c173e7e4f 100644 --- a/ckb-bin/Cargo.toml +++ b/ckb-bin/Cargo.toml @@ -10,7 +10,7 @@ clap = { version = "2" } serde = { version = "1.0", features = ["derive"] } serde_plain = "0.3.0" toml = "0.5" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ckb-app-config = { path = "../util/app-config" } ckb-logger = { path = "../util/logger" } ckb-logger-service = { path = "../util/logger-service" } diff --git a/miner/Cargo.toml b/miner/Cargo.toml index df7fa5153e..8811503ead 100644 --- a/miner/Cargo.toml +++ b/miner/Cargo.toml @@ -13,7 +13,7 @@ ckb-hash = { path = "../util/hash" } ckb-pow = { path = "../pow" } rand = "0.6" serde = { version = "1.0", features = ["derive"] } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" serde_json = "1.0" ckb-jsonrpc-types = { path = "../util/jsonrpc-types" } hyper = "0.12" diff --git a/network/Cargo.toml b/network/Cargo.toml index 3657e80626..2e253920d3 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -15,7 +15,7 @@ ckb-app-config = { path = "../util/app-config" } tokio = { version = "0.2.11", features = ["time", "io-util", "tcp", "dns", "rt-threaded", "blocking", "stream"] } tokio-util = { version = "0.3.0", features = ["codec"] } futures = "0.3" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" p2p = { version="0.3.0", package="tentacle", features = ["molc"] } faketime = "0.2.0" lazy_static = "1.3.0" diff --git a/notify/Cargo.toml b/notify/Cargo.toml index d05fb0dbd7..b89fa6645d 100644 --- a/notify/Cargo.toml +++ b/notify/Cargo.toml @@ -10,6 +10,6 @@ ckb-logger = { path = "../util/logger" } ckb-app-config = { path = "../util/app-config" } ckb-types = { path = "../util/types" } ckb-stop-handler = { path = "../util/stop-handler" } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" [dev-dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 4478da7b8a..3df44af0b9 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -27,7 +27,7 @@ jsonrpc-tcp-server = "~14.1" jsonrpc-ws-server = "~14.1" jsonrpc-server-utils = "~14.1" jsonrpc-pubsub = "~14.1" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" num_cpus = "1.10" diff --git a/sync/Cargo.toml b/sync/Cargo.toml index ed406660cb..750fe0500e 100644 --- a/sync/Cargo.toml +++ b/sync/Cargo.toml @@ -27,7 +27,7 @@ futures = "0.3" ckb-error = {path = "../error"} ckb-tx-pool = { path = "../tx-pool" } ckb-fee-estimator = { path = "../util/fee-estimator" } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ratelimit_meter = "5.0" tempfile = "3.0" diff --git a/test/Cargo.toml b/test/Cargo.toml index 133b9f5cd5..c276aaf95a 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -27,7 +27,7 @@ reqwest = "0.9" rand = "0.6" log = "0.4" env_logger = "0.6" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" faketime = "0.2" failure = "0.1.5" serde_json = "1.0" diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml index 278a18d834..bea97527e1 100644 --- a/tx-pool/Cargo.toml +++ b/tx-pool/Cargo.toml @@ -23,7 +23,7 @@ ckb-chain-spec = { path = "../spec" } ckb-snapshot = { path = "../util/snapshot" } ckb-error = { path = "../error" } tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded", "macros"] } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ckb-async-runtime = { path = "../util/runtime" } ckb-stop-handler = { path = "../util/stop-handler" } ckb-fee-estimator = { path = "../util/fee-estimator" } diff --git a/util/logger-service/Cargo.toml b/util/logger-service/Cargo.toml index b48f209e29..bc4cc32973 100644 --- a/util/logger-service/Cargo.toml +++ b/util/logger-service/Cargo.toml @@ -14,6 +14,6 @@ env_logger = "0.6" lazy_static = "1.3" regex = "1.1.6" chrono = "0.4" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" backtrace = "0.3" sentry = "0.16.0" diff --git a/util/stop-handler/Cargo.toml b/util/stop-handler/Cargo.toml index 6b1b6a6c46..9490a3381d 100644 --- a/util/stop-handler/Cargo.toml +++ b/util/stop-handler/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT" [dependencies] parking_lot = "=0.7.1" -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ckb-logger = { path = "../logger" } futures = "0.1" tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded"] } diff --git a/util/types/Cargo.toml b/util/types/Cargo.toml index 6bd541cb3a..3b25170063 100644 --- a/util/types/Cargo.toml +++ b/util/types/Cargo.toml @@ -13,7 +13,7 @@ bytes = { version="0.5.4", features = ["serde"] } merkle-cbt = "0.2" ckb-occupied-capacity = { path = "../occupied-capacity" } ckb-hash = { path = "../hash" } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" bit-vec = "0.5.1" failure = "0.1.5" ckb-error = { path = "../../error" } diff --git a/verification/Cargo.toml b/verification/Cargo.toml index e44162b975..d6c37cbdcb 100644 --- a/verification/Cargo.toml +++ b/verification/Cargo.toml @@ -23,7 +23,7 @@ failure = "0.1.5" ckb-error = { path = "../error" } enum-display-derive = "0.1.0" tokio = { version = "0.2", features = ["sync", "blocking", "rt-threaded"] } -crossbeam-channel = "0.4" +crossbeam-channel = "0.3" ckb-async-runtime = { path = "../util/runtime" } [dev-dependencies]