Merge pull request #11 from joii2020/rename1

Rename testcase project to sphincsplus_rust_test

Author: XuJiandong

.github/workflows/rust.yml

@@ -15,3 +15,5 @@ jobs:
       run: ./tests/sphincsplus/all_run.sh
     - name: Run sphincs+ rust tests
       run: ./tests/sphincsplus_rust/run_rust.sh
+    - name: Run Tools tests
+      run: cd tools/ckb-sphincs-tools && cargo test 

tests/sphincsplus_rust/Cargo.lock

@@ -1,27 +1,29 @@
 [package]
 edition = "2021"
-name = "sphincsplus_rust"
+name = "sphincsplus_rust_test"
 version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
 default = ["shake", "hash_128", "hash_options_f", "thashes_simple"]
-haraka = []
-sha2 = []
-shake = []
+haraka = ["ckb_sphincs_utils/haraka"]
+sha2 = ["ckb_sphincs_utils/sha2"]
+shake = ["ckb_sphincs_utils/shake"]
 
-hash_128 = []
-hash_192 = []
-hash_256 = []
+hash_128 = ["ckb_sphincs_utils/hash_128"]
+hash_192 = ["ckb_sphincs_utils/hash_192"]
+hash_256 = ["ckb_sphincs_utils/hash_256"]
 
-hash_options_f = []
-hash_options_s = []
+hash_options_f = ["ckb_sphincs_utils/hash_options_f"]
+hash_options_s = ["ckb_sphincs_utils/hash_options_s"]
+
+thashes_robust = ["ckb_sphincs_utils/thashes_robust"]
+thashes_simple = ["ckb_sphincs_utils/thashes_simple"]
 
-thashes_robust = []
-thashes_simple = []
 
 [dependencies]
+ckb_sphincs_utils = { path = "../../tools/ckb-sphincs-utils", default-features = false }
 ckb-chain-spec = "0.107.0"
 ckb-hash = "0.107.0"
 ckb-script = "0.107.0"
@@ -31,6 +33,3 @@ lazy_static = "1.4.0"
 libc = "0.2.139"
 num_enum = "0.5.10"
 rand = "0.8.5"
-
-[build-dependencies]
-cc = "1.0.79"

tests/sphincsplus_rust/Cargo.toml

@@ -1,7 +1,7 @@
 use ckb_script::TransactionScriptsVerifier;
 use ckb_types::packed::Byte32;
-use sphincsplus_rust::dummy_data_loader::DummyDataLoader;
-use sphincsplus_rust::utils::*;
+use sphincsplus_rust_test::dummy_data_loader::DummyDataLoader;
+use sphincsplus_rust_test::utils::*;
 
 pub fn debug_printer(_script: &Byte32, msg: &str) {
     print!("{}", msg);

tests/sphincsplus_rust/examples/run_base.rs

@@ -1,5 +1,2 @@
 pub mod dummy_data_loader;
-pub mod sphincsplus;
 pub mod utils;
-
-pub use sphincsplus::SphincsPlus;

tests/sphincsplus_rust/src/lib.rs

@@ -1,5 +1,5 @@
 use super::dummy_data_loader::DummyDataLoader;
-use super::sphincsplus::*;
+use ckb_sphincs_utils::sphincsplus::*;
 use ckb_hash::blake2b_256;
 use ckb_types::core::{
     cell::{CellMetaBuilder, ResolvedTransaction},

tests/sphincsplus_rust/src/utils.rs

@@ -1,7 +1,7 @@
 use ckb_script::TransactionScriptsVerifier;
 use ckb_types::packed::Byte32;
-use sphincsplus_rust::dummy_data_loader::DummyDataLoader;
-use sphincsplus_rust::utils::*;
+use sphincsplus_rust_test::dummy_data_loader::DummyDataLoader;
+use sphincsplus_rust_test::utils::*;
 
 pub fn debug_printer(_script: &Byte32, msg: &str) {
     print!("{}", msg);

tests/sphincsplus_rust/tests/test_sphincsplus.rs

@@ -7,19 +7,19 @@ version = "0.1.0"
 
 [features]
 default = ["shake", "hash_128", "hash_options_f", "thashes_simple"]
-haraka = ["sphincsplus_rust/haraka"]
-sha2 = ["sphincsplus_rust/sha2"]
-shake = ["sphincsplus_rust/shake"]
+haraka = ["ckb_sphincs_utils/haraka"]
+sha2 = ["ckb_sphincs_utils/sha2"]
+shake = ["ckb_sphincs_utils/shake"]
 
-hash_128 = ["sphincsplus_rust/hash_128"]
-hash_192 = ["sphincsplus_rust/hash_192"]
-hash_256 = ["sphincsplus_rust/hash_256"]
+hash_128 = ["ckb_sphincs_utils/hash_128"]
+hash_192 = ["ckb_sphincs_utils/hash_192"]
+hash_256 = ["ckb_sphincs_utils/hash_256"]
 
-hash_options_f = ["sphincsplus_rust/hash_options_f"]
-hash_options_s = ["sphincsplus_rust/hash_options_s"]
+hash_options_f = ["ckb_sphincs_utils/hash_options_f"]
+hash_options_s = ["ckb_sphincs_utils/hash_options_s"]
 
-thashes_robust = ["sphincsplus_rust/thashes_robust"]
-thashes_simple = ["sphincsplus_rust/thashes_simple"]
+thashes_robust = ["ckb_sphincs_utils/thashes_robust"]
+thashes_simple = ["ckb_sphincs_utils/thashes_simple"]
 
 [dependencies]
 ckb-crypto = "0.106.0"
@@ -30,4 +30,4 @@ ckb-types = "0.106.0"
 clap = {version = "4.1.7", features = ["derive"]}
 lazy_static = "1.4.0"
 serde_json = "1.0.93"
-sphincsplus_rust = {path = "../../tests/sphincsplus_rust", default-features = false}
+ckb_sphincs_utils = {path = "../ckb-sphincs-utils", default-features = false}

tools/ckb-sphincs-tools/Cargo.lock

@@ -14,7 +14,7 @@ use ckb_types::{
     H256,
 };
 use lazy_static::lazy_static;
-use sphincsplus_rust::SphincsPlus;
+use ckb_sphincs_utils::SphincsPlus;
 
 lazy_static! {
     pub static ref SPHINCSPLUS_EXAMPLE_BIN: Bytes =