diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index db60fcf..d789a12 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -35,6 +35,12 @@ jobs: command: check args: --benches + - name: check (tests) + uses: actions-rs/cargo@v1 + with: + command: check + args: --tests + - name: test uses: actions-rs/cargo@v1 with: @@ -45,6 +51,13 @@ jobs: with: command: clippy args: --all-targets --all-features -- -Dwarnings + + # test packaging to avoid surprisis at release time + - name: package + uses: actions-rs/cargo@v1 + with: + command: package + build-wasm: name: build wasm32 diff --git a/Cargo.toml b/Cargo.toml index ae16f16..ca4ca63 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,10 @@ criterion = { version= "0.4", features=["html_reports"] } hex = "0.4" pretty_assertions = "1.3" rand = "0.8" -test_vectors = { version = "0.1.0", path = "utils/test_vectors" } +serde_json = "1.0" +serde = { version = "1.0", features = ["derive"] } +lazy_static = "1.4.0" + [features] default = [] diff --git a/src/crypto/aead.rs b/src/crypto/aead.rs index c7165f6..5fa7cc0 100644 --- a/src/crypto/aead.rs +++ b/src/crypto/aead.rs @@ -169,7 +169,7 @@ mod test { } mod test_vectors { - use test_vectors::get_test_vector; + use crate::test_vectors::get_test_vector; use crate::{ crypto::{ diff --git a/src/crypto/key_expansion.rs b/src/crypto/key_expansion.rs index 07949e8..42f76ea 100644 --- a/src/crypto/key_expansion.rs +++ b/src/crypto/key_expansion.rs @@ -68,7 +68,7 @@ mod ring { #[cfg(test)] mod test { - use test_vectors::get_test_vector; + use crate::test_vectors::get_test_vector; use crate::{ crypto::{ diff --git a/src/crypto/secret.rs b/src/crypto/secret.rs index 0fdf378..a922fa4 100644 --- a/src/crypto/secret.rs +++ b/src/crypto/secret.rs @@ -27,7 +27,7 @@ impl Secret { #[cfg(test)] mod test { - use test_vectors::get_test_vector; + use crate::test_vectors::get_test_vector; use crate::{ crypto::{cipher_suite::CipherSuiteVariant, key_expansion::KeyMaterial}, diff --git a/src/header/mod.rs b/src/header/mod.rs index 1f45958..932ff30 100644 --- a/src/header/mod.rs +++ b/src/header/mod.rs @@ -253,7 +253,7 @@ mod test { #[test] fn serialize_test_vectors() { - test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm128Sha256 as u8) + crate::test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm128Sha256 as u8) .encryptions .iter() .for_each(|test_vector| { @@ -267,7 +267,7 @@ mod test { #[test] fn deserialize_test_vectors() { - test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm256Sha512 as u8) + crate::test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm256Sha512 as u8) .encryptions .iter() .for_each(|test_vector| { diff --git a/src/lib.rs b/src/lib.rs index ac6eb09..c0643d6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -33,3 +33,6 @@ pub mod header; pub mod receiver; pub mod sender; pub use crypto::cipher_suite::CipherSuiteVariant; + +#[cfg(test)] +pub mod test_vectors; diff --git a/utils/test_vectors/src/lib.rs b/src/test_vectors/mod.rs similarity index 96% rename from utils/test_vectors/src/lib.rs rename to src/test_vectors/mod.rs index a8dbee9..d8400e4 100644 --- a/utils/test_vectors/src/lib.rs +++ b/src/test_vectors/mod.rs @@ -1,5 +1,6 @@ // Copyright (c) 2023 GoTo Group, Inc // SPDX-License-Identifier: Apache-2.0 AND MIT +#![allow(clippy::missing_panics_doc)] extern crate serde; @@ -61,7 +62,7 @@ fn parse_test_vectors() -> Vec { #[cfg(test)] mod test { - use crate::get_test_vector; + use super::get_test_vector; #[test] fn should_parse_test_vectors() { diff --git a/utils/test_vectors/src/test-vectors.json b/src/test_vectors/test-vectors.json similarity index 100% rename from utils/test_vectors/src/test-vectors.json rename to src/test_vectors/test-vectors.json diff --git a/utils/test_vectors/Cargo.toml b/utils/test_vectors/Cargo.toml deleted file mode 100644 index 8806907..0000000 --- a/utils/test_vectors/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "test_vectors" -version = "0.1.0" -edition = "2021" -publish = false - -[dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = ["derive"] } -hex = "0.4" -lazy_static = "1.4.0"