Skip to content

Commit edd167f

Browse files
authored
chore(rust/signed-doc): Making tests/common module as a public mod catalyst_signed_doc::tests_utils (#709)
* move `common` module into the `catalyst-signed-doc` crate as a `tests_utils` module * wip * fix * add new `catalyst-signed-doc-tests-utils` crate * wip * wip * wip * wip
1 parent 9cb603e commit edd167f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+473
-451
lines changed

rust/signed_doc/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ multibase = "0.9.2"
4545
async-trait = "0.1.89"
4646
dashmap = "6.1.0"
4747

48+
# tests_utils dependencies
49+
rand = "0.8.5"
50+
4851
[dev-dependencies]
4952
base64-url = "3.0.0"
50-
rand = "0.8.5"
5153
uuid = { version = "1.12.0", features = ["v7"] }
5254
tokio = { version = "1.42.0", features = ["macros"] }
5355
test-case = "3.3.1"

rust/signed_doc/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub mod doc_types;
88
mod metadata;
99
pub mod providers;
1010
mod signature;
11+
pub mod tests_utils;
1112
pub mod validator;
1213

1314
use std::{

rust/signed_doc/src/metadata/document_refs/doc_locator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mod tests {
146146
use minicbor::{Decoder, Encoder};
147147

148148
use super::*;
149-
use crate::{Builder, ContentType, metadata::document_refs::tests::create_dummy_doc_ref};
149+
use crate::{Builder, ContentType, tests_utils::create_dummy_doc_ref};
150150

151151
#[test]
152152
fn test_doc_locator_encode_decode() {

rust/signed_doc/src/metadata/document_refs/mod.rs

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -195,31 +195,12 @@ mod serde_impl {
195195
#[cfg(test)]
196196
pub(crate) mod tests {
197197

198-
use catalyst_types::uuid::{CborContext, UuidV4, UuidV7};
198+
use catalyst_types::uuid::{CborContext, UuidV7};
199199
use minicbor::{Decoder, Encoder};
200200
use test_case::test_case;
201201

202202
use super::*;
203-
use crate::{ContentType, builder::Builder};
204-
205-
pub(crate) fn create_dummy_doc_ref() -> DocumentRef {
206-
let id = UuidV7::new();
207-
let ver = UuidV7::new();
208-
let doc = Builder::new()
209-
.with_json_metadata(serde_json::json!({
210-
"id": id.to_string(),
211-
"ver": ver.to_string(),
212-
"type": UuidV4::new().to_string(),
213-
"content-type": ContentType::Json,
214-
}))
215-
.expect("Should create metadata")
216-
.with_json_content(&serde_json::json!({"test": "content"}))
217-
.expect("Should set content")
218-
.build()
219-
.expect("Should build document");
220-
221-
doc.doc_ref().expect("Should generate DocumentRef")
222-
}
203+
use crate::tests_utils::create_dummy_doc_ref;
223204

224205
#[test_case(
225206
CompatibilityPolicy::Accept,

rust/signed_doc/tests/common/brand_parameters.rs renamed to rust/signed_doc/src/tests_utils/brand_parameters.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn brand_parameters_doc(
710
template: &CatalystSignedDocument,
811
provider: &mut TestCatalystProvider,
912
) -> anyhow::Result<CatalystSignedDocument> {
1013
let id = UuidV7::new();
11-
let (sk, kid) = create_dummy_key_pair(None);
14+
let (sk, kid) = create_dummy_admin_key_pair();
1215
provider.add_sk(kid.clone(), sk.clone());
1316

1417
let template_ref = template.doc_ref()?;

rust/signed_doc/tests/common/brand_parameters_form_template.rs renamed to rust/signed_doc/src/tests_utils/brand_parameters_form_template.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn brand_parameters_form_template_doc(
710
provider: &mut TestCatalystProvider
811
) -> anyhow::Result<CatalystSignedDocument> {
912
let id = UuidV7::new();
10-
let (sk, kid) = create_dummy_key_pair(None);
13+
let (sk, kid) = create_dummy_admin_key_pair();
1114
provider.add_sk(kid.clone(), sk.clone());
1215
Builder::new()
1316
.with_json_metadata(serde_json::json!({

rust/signed_doc/tests/common/campaign_parameters.rs renamed to rust/signed_doc/src/tests_utils/campaign_parameters.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn campaign_parameters_doc(
710
template: &CatalystSignedDocument,
811
parameters: &CatalystSignedDocument,
912
provider: &mut TestCatalystProvider,
1013
) -> anyhow::Result<CatalystSignedDocument> {
1114
let id = UuidV7::new();
12-
let (sk, kid) = create_dummy_key_pair(None);
15+
let (sk, kid) = create_dummy_admin_key_pair();
1316
provider.add_sk(kid.clone(), sk.clone());
1417

1518
let template_ref = template.doc_ref()?;

rust/signed_doc/tests/common/campaign_parameters_form_template.rs renamed to rust/signed_doc/src/tests_utils/campaign_parameters_form_template.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn campaign_parameters_form_template_doc(
710
parameters: &CatalystSignedDocument,
811
provider: &mut TestCatalystProvider,
912
) -> anyhow::Result<CatalystSignedDocument> {
1013
let id = UuidV7::new();
11-
let (sk, kid) = create_dummy_key_pair(None);
14+
let (sk, kid) = create_dummy_admin_key_pair();
1215
provider.add_sk(kid.clone(), sk.clone());
1316

1417
let parameters_ref = parameters.doc_ref()?;

rust/signed_doc/tests/common/category_parameters.rs renamed to rust/signed_doc/src/tests_utils/category_parameters.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn category_parameters_doc(
710
template: &CatalystSignedDocument,
811
parameters: &CatalystSignedDocument,
912
provider: &mut TestCatalystProvider,
1013
) -> anyhow::Result<CatalystSignedDocument> {
1114
let id = UuidV7::new();
12-
let (sk, kid) = create_dummy_key_pair(None);
15+
let (sk, kid) = create_dummy_admin_key_pair();
1316
provider.add_sk(kid.clone(), sk.clone());
1417

1518
let template_ref = template.doc_ref()?;

rust/signed_doc/tests/common/category_parameters_form_template.rs renamed to rust/signed_doc/src/tests_utils/category_parameters_form_template.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
21
use ed25519_dalek::ed25519::signature::Signer;
32

4-
use super::*;
3+
use crate::{
4+
Builder, CatalystSignedDocument, ContentEncoding, ContentType, doc_types,
5+
providers::tests::TestCatalystProvider, tests_utils::create_dummy_admin_key_pair, uuid::UuidV7,
6+
};
57

8+
#[allow(clippy::missing_errors_doc)]
69
pub fn category_parameters_form_template_doc(
710
parameters: &CatalystSignedDocument,
811
provider: &mut TestCatalystProvider,
912
) -> anyhow::Result<CatalystSignedDocument> {
1013
let id = UuidV7::new();
11-
let (sk, kid) = create_dummy_key_pair(None);
14+
let (sk, kid) = create_dummy_admin_key_pair();
1215
provider.add_sk(kid.clone(), sk.clone());
1316

1417
let parameters_ref = parameters.doc_ref()?;

0 commit comments

Comments
 (0)