Implemented a workaround to bypass the [issue](rust-lang/cargo#8170).

EthanYuan · Sep 1, 2023 · 156a759 · 156a759
1 parent d9549ab
commit 156a759
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/util/gen-types/Cargo.toml b/util/gen-types/Cargo.toml
@@ -20,12 +20,12 @@ check-data = []
 # Enable the `serialized-size` extension for CKB contract development in `no-std` env
 serialized-size = ["calc-hash"]
 # Enable all in `std` env
-std = ["molecule/std", "ckb-hash", "ckb-fixed-hash", "ckb-error", "ckb-occupied-capacity", "numext-fixed-uint"]
+std = ["molecule/std", "ckb-hash/default", "ckb-fixed-hash", "ckb-error", "ckb-occupied-capacity", "numext-fixed-uint"]
 
 [dependencies]
 cfg-if = "1.0"
-ckb-hash = { path = "../hash", version = "= 0.111.0-rc11" }
 molecule = { version = "0.7.5", default-features = false }
+ckb-hash = { path = "../hash", version = "= 0.111.0-rc11", default-features = false, optional = true }
 ckb-fixed-hash = { path = "../fixed-hash", version = "= 0.111.0-rc11", optional = true }
 ckb-error = { path = "../../error", version = "= 0.111.0-rc11", optional = true }
 ckb-occupied-capacity = { path = "../occupied-capacity", version = "= 0.111.0-rc11", optional = true }

diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml
@@ -9,11 +9,14 @@ homepage = "https://github.com/nervosnetwork/ckb"
 repository = "https://github.com/nervosnetwork/ckb"
 
 [features]
-default = []
-ckb-contract = [] # This feature is used for CKB contract development
+default = ["blake2b"]
+ckb-contract = ["blake2b-ref"] # This feature is used for CKB contract development
 
-[target.'cfg(not(any(target_arch = "wasm32", features = "ckb-contract")))'.dependencies]
-blake2b = { package = "blake2b-rs", version = "0.2" }
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+blake2b = { package = "blake2b-rs", version = "0.2", optional = true }
 
-[target.'cfg(any(target_arch = "wasm32", features = "ckb-contract"))'.dependencies]
-blake2b = { package = "blake2b-ref", version = "0.2.0" }
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+blake2b = { package = "blake2b-ref", version = "0.3", optional = true }
+
+[dependencies]
+blake2b-ref = { version = "0.3", optional = true }
diff --git a/util/hash/src/lib.rs b/util/hash/src/lib.rs
@@ -9,7 +9,10 @@
 
 #![no_std]
 
+#[cfg(feature = "default")]
 pub use blake2b::{Blake2b, Blake2bBuilder};
+#[cfg(feature = "ckb-contract")]
+pub use blake2b_ref::{Blake2b, Blake2bBuilder};
 
 #[doc(hidden)]
 pub const BLAKE2B_KEY: &[u8] = &[];