Merge branch 'develop' into ckb2021-develop

nervosnetwork · Jun 14, 2021 · c397d22 · c397d22
2 parents 6893a07 + 7cd650d
commit c397d22
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 85 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -203,7 +203,7 @@ jobs:
       - Benchmarks_Test
       - Integration_Test
     if: |
-       contains('bors[bot]', github.actor) && success()
+        (contains(github.event_name, 'pull_request') || contains('bors[bot]', github.actor)) && success()
     runs-on: ubuntu-latest
     steps:
       - name: CI succeeded

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ build = "build.rs"
 description = "CKB is the layer 1 of Nervos Network, a public/permissionless blockchain."
 homepage = "https://github.com/nervosnetwork/ckb"
 repository = "https://github.com/nervosnetwork/ckb"
+resolver = "2"
 
 [build-dependencies]
 ckb-build-info = { path = "util/build-info", version = "= 0.43.0-pre" }

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -23,7 +23,7 @@ ckb-hash = {path = "../util/hash", version = "= 0.43.0-pre"}
 ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.43.0-pre" }
 ckb-dao-utils = { path = "../util/dao/utils", version = "= 0.43.0-pre" }
 ckb-dao = { path = "../util/dao", version = "= 0.43.0-pre" }
-ckb-system-scripts = { version = "= 0.5.1" }
+ckb-system-scripts = { version = "= 0.5.2" }
 lazy_static = "1.3.0"
 ckb-crypto = { path = "../util/crypto", version = "= 0.43.0-pre" }
 ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.43.0-pre" }

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -26,6 +26,7 @@ ckb-error = { path = "../error", version = "= 0.43.0-pre" }
 ckb-app-config = { path = "../util/app-config", version = "= 0.43.0-pre" }
 ckb-rust-unstable-port = { path = "../util/rust-unstable-port", version = "= 0.43.0-pre" }
 ckb-channel = { path = "../util/channel", version = "= 0.43.0-pre" }
+faux = { version = "^0.1", optional = true }
 
 [dev-dependencies]
 ckb-test-chain-utils = { path = "../util/test-chain-utils", version = "= 0.43.0-pre" }
@@ -35,3 +36,7 @@ ckb-jsonrpc-types = { path = "../util/jsonrpc-types", version = "= 0.43.0-pre" }
 ckb-network = { path = "../network", version = "= 0.43.0-pre" }
 lazy_static = "1.4"
 tempfile = "3.0"
+
+[features]
+default = []
+mock = ["faux"]