Merge pull request #4205 from chenyukang/fix-macos-proxy-issue

chore: Fix macos proxy issue in development env
nervosnetwork · Oct 27, 2023 · 73ddfbf · 73ddfbf
2 parents 115d891 + 64e2095
commit 73ddfbf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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"]