Add ckb-std-wrapper on tests

To facilitate version switching of ckb-std during debugging, ckb-std-wrapper has been added in the tests as a dependency for ckb-std

tests/Cargo.toml

@@ -14,6 +14,7 @@ members = [
   "contracts/exec-child",
   "contracts/exec-parent",
   "libs/spawn_cmd",
+  "libs/ckb-std-wrapper",
   "tests",
 ]
 

tests/contracts/exec-child/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01" }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [features]
-native-simulator = ["ckb-std/native-simulator"]
+native-simulator = ["ckb-std-wrapper/native-simulator"]
 

tests/contracts/exec-child/src/main.rs

@@ -10,6 +10,7 @@ use ckb_std::default_alloc;
 ckb_std::entry!(program_entry);
 #[cfg(not(any(feature = "native-simulator", test)))]
 default_alloc!();
+use ckb_std_wrapper::ckb_std;
 
 pub fn program_entry() -> i8 {
     ckb_std::debug!("This is a sample contract exec-child!");

tests/contracts/exec-parent/Cargo.toml

@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01" }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [features]
-native-simulator = ["ckb-std/native-simulator"]
+native-simulator = ["ckb-std-wrapper/native-simulator"]
 

tests/contracts/exec-parent/src/main.rs

@@ -10,6 +10,7 @@ use ckb_std::default_alloc;
 ckb_std::entry!(program_entry);
 #[cfg(not(any(feature = "native-simulator", test)))]
 default_alloc!();
+use ckb_std_wrapper::ckb_std;
 
 use ckb_std::ckb_types::bytes::Bytes;
 use ckb_std::ckb_types::core::ScriptHashType;

tests/contracts/spawn-child/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01" }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 spawn_cmd = { path = "../../libs/spawn_cmd" }
 
 [features]
-native-simulator = ["ckb-std/native-simulator"]
+native-simulator = ["ckb-std-wrapper/native-simulator"]
 

tests/contracts/spawn-child/src/main.rs

@@ -8,6 +8,7 @@ ckb_std::default_alloc!();
 
 #[cfg(any(feature = "native-simulator", test))]
 extern crate alloc;
+use ckb_std_wrapper::ckb_std;
 
 use alloc::{
     string::{String, ToString},

tests/contracts/spawn-parent/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01" }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 spawn_cmd = { path = "../../libs/spawn_cmd" }
 
 [features]
-native-simulator = ["ckb-std/native-simulator"]
+native-simulator = ["ckb-std-wrapper/native-simulator"]
 

tests/contracts/spawn-parent/src/main.rs

@@ -8,6 +8,7 @@ ckb_std::default_alloc!();
 
 #[cfg(any(feature = "native-simulator", test))]
 extern crate alloc;
+use ckb_std_wrapper::ckb_std;
 
 use alloc::{
     string::{String, ToString},

tests/libs/ckb-std-wrapper/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "ckb-std-wrapper"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+native-simulator = ["ckb-std/native-simulator"]
+
+[dependencies]
+ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01" }

tests/libs/ckb-std-wrapper/src/lib.rs

@@ -0,0 +1,2 @@
+#![cfg_attr(not(feature = "native-simulator"), no_std)]
+pub use ckb_std;

tests/native-simulators/exec-child-sim/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 exec-child = { path = "../../contracts/exec-child", features = ["native-simulator"] }
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01", features = ["native-simulator"] }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [lib]
 crate-type = ["cdylib"]

tests/native-simulators/exec-child-sim/src/lib.rs

@@ -1 +1,2 @@
+use ckb_std_wrapper::ckb_std;
 ckb_std::entry_simulator!(exec_child::program_entry);

tests/native-simulators/exec-parent-sim/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 exec-parent = { path = "../../contracts/exec-parent", features = ["native-simulator"] }
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01", features = ["native-simulator"] }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [lib]
 crate-type = ["cdylib"]

tests/native-simulators/exec-parent-sim/src/lib.rs

@@ -1 +1,2 @@
+use ckb_std_wrapper::ckb_std;
 ckb_std::entry_simulator!(exec_parent::program_entry);

tests/native-simulators/spawn-child-sim/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 spawn-child = { path = "../../contracts/spawn-child", features = ["native-simulator"] }
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01", features = ["native-simulator"] }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [lib]
 crate-type = ["cdylib"]

tests/native-simulators/spawn-child-sim/src/lib.rs

@@ -1 +1,2 @@
+use ckb_std_wrapper::ckb_std;
 ckb_std::entry_simulator!(spawn_child::program_entry);

tests/native-simulators/spawn-parent-sim/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 spawn-parent = { path = "../../contracts/spawn-parent", features = ["native-simulator"] }
-ckb-std = { git = "https://github.com/joii2020/ckb-std.git", rev = "5bd8c01", features = ["native-simulator"] }
+ckb-std-wrapper = { path = "../../libs/ckb-std-wrapper" }
 
 [lib]
 crate-type = ["cdylib"]

tests/native-simulators/spawn-parent-sim/src/lib.rs

@@ -1 +1,2 @@
+use ckb_std_wrapper::ckb_std;
 ckb_std::entry_simulator!(spawn_parent::program_entry);