From 64e2095ca00286d31fce40a303a2adad5a60fa63 Mon Sep 17 00:00:00 2001
From: yukang <moorekang@gmail.com>
Date: Thu, 26 Oct 2023 17:24:20 +0800
Subject: [PATCH] lock reqwest to 0.11.20 for macos proxy issue

---
 Cargo.lock         | 26 ++------------------------
 rpc/Cargo.toml     |  2 +-
 test/Cargo.toml    |  2 +-
 tx-pool/Cargo.toml |  8 ++++----
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c411151fe..bfe97d83f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3939,9 +3939,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
  "base64",
  "bytes 1.5.0",
@@ -3964,7 +3964,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tower-service",
@@ -4492,27 +4491,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.8.0"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index a0c8e77620..b7fe1adbc6 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -47,7 +47,7 @@ itertools.workspace = true
 tokio = "1"
 
 [dev-dependencies]
-reqwest = { version = "0.11.4", features = ["blocking", "json"] }
+reqwest = { version = "=0.11.20", features = ["blocking", "json"] }
 serde = { version = "1.0", features = ["derive"] }
 ckb-launcher = { path = "../util/launcher", version = "= 0.113.0-pre" }
 ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.113.0-pre" }
diff --git a/test/Cargo.toml b/test/Cargo.toml
index 18e2311f43..ca765f445b 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -30,7 +30,7 @@ ckb-logger-service = { path = "../util/logger-service", version = "= 0.113.0-pre
 ckb-error = { path = "../error", version = "= 0.113.0-pre" }
 ckb-constant = { path = "../util/constant", version = "= 0.113.0-pre" }
 tempfile = "3"
-reqwest = { version = "0.11.4", features = ["blocking", "json"] }
+reqwest = { version = "=0.11.20", features = ["blocking", "json"] }
 rand = "0.7"
 ckb-systemtime = { path = "../util/systemtime", version = "= 0.113.0-pre" }
 serde_json = "1.0"
diff --git a/tx-pool/Cargo.toml b/tx-pool/Cargo.toml
index 9d5194843f..4a08cced80 100644
--- a/tx-pool/Cargo.toml
+++ b/tx-pool/Cargo.toml
@@ -12,9 +12,9 @@ repository = "https://github.com/nervosnetwork/ckb"
 
 [dependencies]
 ckb-types = { path = "../util/types", version = "= 0.113.0-pre" }
-ckb-logger = {path = "../util/logger", version = "= 0.113.0-pre"}
+ckb-logger = { path = "../util/logger", version = "= 0.113.0-pre" }
 ckb-verification = { path = "../verification", version = "= 0.113.0-pre" }
-ckb-systemtime = {path = "../util/systemtime", version = "= 0.113.0-pre"}
+ckb-systemtime = { path = "../util/systemtime", version = "= 0.113.0-pre" }
 lru = "0.7.1"
 ckb-dao = { path = "../util/dao", version = "= 0.113.0-pre" }
 ckb-reward-calculator = { path = "../util/reward-calculator", version = "= 0.113.0-pre" }
@@ -50,5 +50,5 @@ ckb-systemtime = {path = "../util/systemtime", version = "= 0.113.0-pre", featur
 default = []
 internal = []
 with_sentry = ["sentry"]
-portable = ["ckb-db/portable", "ckb-store/portable","ckb-snapshot/portable"]
-march-native = ["ckb-db/march-native", "ckb-store/march-native","ckb-snapshot/march-native"]
+portable = ["ckb-db/portable", "ckb-store/portable", "ckb-snapshot/portable"]
+march-native = ["ckb-db/march-native", "ckb-store/march-native", "ckb-snapshot/march-native"]