Skip to content

Commit 09ddb41

Browse files
author
Tobias Waurick
authored
Merge pull request #26 from goto-opensource/feature/hendriks/packaging-check
ci: run cargo-package to be safe
2 parents e74c530 + c0ffee9 commit 09ddb41

File tree

10 files changed

+27
-18
lines changed

10 files changed

+27
-18
lines changed

.github/workflows/build_test.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ jobs:
3535
command: check
3636
args: --benches
3737

38+
- name: check (tests)
39+
uses: actions-rs/cargo@v1
40+
with:
41+
command: check
42+
args: --tests
43+
3844
- name: test
3945
uses: actions-rs/cargo@v1
4046
with:
@@ -45,6 +51,13 @@ jobs:
4551
with:
4652
command: clippy
4753
args: --all-targets --all-features -- -Dwarnings
54+
55+
# test packaging to avoid surprisis at release time
56+
- name: package
57+
uses: actions-rs/cargo@v1
58+
with:
59+
command: package
60+
4861

4962
build-wasm:
5063
name: build wasm32

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ criterion = { version= "0.4", features=["html_reports"] }
2929
hex = "0.4"
3030
pretty_assertions = "1.3"
3131
rand = "0.8"
32-
test_vectors = { version = "0.1.0", path = "utils/test_vectors" }
32+
serde_json = "1.0"
33+
serde = { version = "1.0", features = ["derive"] }
34+
lazy_static = "1.4.0"
35+
3336

3437
[features]
3538
default = []

src/crypto/aead.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ mod test {
169169
}
170170

171171
mod test_vectors {
172-
use test_vectors::get_test_vector;
172+
use crate::test_vectors::get_test_vector;
173173

174174
use crate::{
175175
crypto::{

src/crypto/key_expansion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ mod ring {
6868

6969
#[cfg(test)]
7070
mod test {
71-
use test_vectors::get_test_vector;
71+
use crate::test_vectors::get_test_vector;
7272

7373
use crate::{
7474
crypto::{

src/crypto/secret.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl Secret {
2727

2828
#[cfg(test)]
2929
mod test {
30-
use test_vectors::get_test_vector;
30+
use crate::test_vectors::get_test_vector;
3131

3232
use crate::{
3333
crypto::{cipher_suite::CipherSuiteVariant, key_expansion::KeyMaterial},

src/header/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ mod test {
253253

254254
#[test]
255255
fn serialize_test_vectors() {
256-
test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm128Sha256 as u8)
256+
crate::test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm128Sha256 as u8)
257257
.encryptions
258258
.iter()
259259
.for_each(|test_vector| {
@@ -267,7 +267,7 @@ mod test {
267267

268268
#[test]
269269
fn deserialize_test_vectors() {
270-
test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm256Sha512 as u8)
270+
crate::test_vectors::get_test_vector(crate::CipherSuiteVariant::AesGcm256Sha512 as u8)
271271
.encryptions
272272
.iter()
273273
.for_each(|test_vector| {

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ pub mod header;
3333
pub mod receiver;
3434
pub mod sender;
3535
pub use crypto::cipher_suite::CipherSuiteVariant;
36+
37+
#[cfg(test)]
38+
pub mod test_vectors;

utils/test_vectors/src/lib.rs renamed to src/test_vectors/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) 2023 GoTo Group, Inc
22
// SPDX-License-Identifier: Apache-2.0 AND MIT
3+
#![allow(clippy::missing_panics_doc)]
34

45
extern crate serde;
56

@@ -61,7 +62,7 @@ fn parse_test_vectors() -> Vec<TestVector> {
6162

6263
#[cfg(test)]
6364
mod test {
64-
use crate::get_test_vector;
65+
use super::get_test_vector;
6566

6667
#[test]
6768
fn should_parse_test_vectors() {
File renamed without changes.

utils/test_vectors/Cargo.toml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)