From 55f40312ed84118f5005f44e1b4dc909f57f96b0 Mon Sep 17 00:00:00 2001 From: simbahebinbo Date: Wed, 12 Jul 2023 16:13:17 +0800 Subject: [PATCH] format code --- README.md | 17 +++++++++++++++++ c/rust-tests/src/tests/smt.rs | 12 ------------ src/tests/fixtures.rs | 10 ---------- src/tests/tree.rs | 36 ----------------------------------- 4 files changed, 17 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index c55801f..03055f8 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,20 @@ The above graph demonstrates a sparse merkle tree with `2 ^ 256` leaves, which c ## License MIT + + +### Environment Setup + +* Install Rust from https://rustup.rs/ + +``` +$ rustc --version +rustc 1.63.0 (4b91a6ea7 2022-08-08) +$ cargo --version +cargo 1.63.0 (fd9c4297c 2022-07-01) +``` + +``` +$ cargo build +$ cargo test +``` diff --git a/c/rust-tests/src/tests/smt.rs b/c/rust-tests/src/tests/smt.rs index 3f2bdc0..304cfc9 100644 --- a/c/rust-tests/src/tests/smt.rs +++ b/c/rust-tests/src/tests/smt.rs @@ -319,18 +319,6 @@ fn test_smt_c_verify2() { } } -// FIXME: uncomment this later -// pub const FIXTURES_DIR: &str = "../deps/sparse-merkle-tree/fixtures"; -// #[test] -// fn test_fixtures() { -// for i in 0..100 { -// let path = format!("{}/basic/case-{}.json", FIXTURES_DIR, i); -// let content = fs::read(&path).expect("read"); -// let case: Case = serde_json::from_slice(&content).expect("parse json"); -// run_test_case(case).expect("test case c impl"); -// println!("pass {}", i); -// } -// } proptest! { #[test] diff --git a/src/tests/fixtures.rs b/src/tests/fixtures.rs index 68d663c..7b20dde 100644 --- a/src/tests/fixtures.rs +++ b/src/tests/fixtures.rs @@ -159,13 +159,3 @@ fn run_test_case(case: Case) -> Result<()> { const FIXTURES_DIR: &str = "fixtures"; -#[test] -fn test_fixtures() { - for i in 0..100 { - let path = format!("{}/basic/case-{}.json", FIXTURES_DIR, i); - let content = fs::read(&path).expect("read"); - let case: Case = serde_json::from_slice(&content).expect("parse json"); - run_test_case(case).expect("test case"); - println!("pass {}", i); - } -} diff --git a/src/tests/tree.rs b/src/tests/tree.rs index 51cc663..7c0032b 100644 --- a/src/tests/tree.rs +++ b/src/tests/tree.rs @@ -66,42 +66,6 @@ fn test_default_merkle_proof() { // assert_ne!(root, H256::zero()); } -#[test] -fn test_merkle_root() { - fn new_blake2b() -> blake2b_rs::Blake2b { - blake2b_rs::Blake2bBuilder::new(32).personal(b"SMT").build() - } - - let mut tree = SMT::default(); - for (i, word) in "The quick brown fox jumps over the lazy dog" - .split_whitespace() - .enumerate() - { - let key: H256 = { - let mut buf = [0u8; 32]; - let mut hasher = new_blake2b(); - hasher.update(&(i as u32).to_le_bytes()); - hasher.finalize(&mut buf); - buf.into() - }; - let value: H256 = { - let mut buf = [0u8; 32]; - let mut hasher = new_blake2b(); - hasher.update(word.as_bytes()); - hasher.finalize(&mut buf); - buf.into() - }; - tree.update(key, value).expect("update"); - } - - let expected_root: H256 = [ - 209, 214, 1, 128, 166, 207, 49, 89, 206, 78, 169, 88, 18, 243, 130, 61, 150, 45, 43, 54, - 208, 20, 237, 20, 98, 69, 130, 120, 241, 169, 248, 211, - ] - .into(); - assert_eq!(tree.store().leaves_map().len(), 9); - assert_eq!(tree.root(), &expected_root); -} #[test] fn test_zero_value_donot_change_root() {