Skip to content

Commit 7715499

Browse files
Mr-LeshiyMr-Leshiy
committed
wip
1 parent 7faf45a commit 7715499

File tree

4 files changed

+42
-72
lines changed

4 files changed

+42
-72
lines changed

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

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -140,38 +140,18 @@ impl Encode<()> for DocLocator {
140140
}
141141

142142
#[cfg(test)]
143-
pub(crate) mod tests {
143+
mod tests {
144144

145145
use minicbor::{Decoder, Encoder};
146146

147147
use super::*;
148-
use crate::{Builder, ContentType, UuidV7};
149-
150-
pub(crate) fn create_dummy_doc_locator() -> DocLocator {
151-
use crate::UuidV4;
152-
153-
let id = UuidV7::new();
154-
let ver = UuidV7::new();
155-
let doc = Builder::new()
156-
.with_json_metadata(serde_json::json!({
157-
"id": id.to_string(),
158-
"ver": ver.to_string(),
159-
"type": UuidV4::new().to_string(),
160-
"content-type": ContentType::Json,
161-
}))
162-
.expect("Should create metadata")
163-
.with_json_content(&serde_json::json!({"test": "content"}))
164-
.expect("Should set content")
165-
.build()
166-
.expect("Should build document");
167-
168-
let cid = doc.to_cid_v1().expect("Should generate CID");
169-
DocLocator::from(cid)
170-
}
148+
use crate::{
149+
Builder, ContentType, UuidV7, metadata::document_refs::tests::create_dummy_doc_ref,
150+
};
171151

172152
#[test]
173153
fn test_doc_locator_encode_decode() {
174-
let locator = create_dummy_doc_locator();
154+
let locator = create_dummy_doc_ref().doc_locator().clone();
175155
let mut buffer = Vec::new();
176156
let mut encoder = Encoder::new(&mut buffer);
177157
locator.encode(&mut encoder, &mut ()).unwrap();
@@ -182,7 +162,7 @@ pub(crate) mod tests {
182162

183163
#[test]
184164
fn test_doc_locator_display() {
185-
let locator = create_dummy_doc_locator();
165+
let locator = create_dummy_doc_ref().doc_locator().clone();
186166
let display_str = locator.to_string();
187167
assert!(
188168
display_str.starts_with('b'),
@@ -192,7 +172,7 @@ pub(crate) mod tests {
192172

193173
#[test]
194174
fn test_doc_locator_from_str() {
195-
let locator = create_dummy_doc_locator();
175+
let locator = create_dummy_doc_ref().doc_locator().clone();
196176
let display_str = locator.to_string();
197177
let parsed = display_str
198178
.parse::<DocLocator>()

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

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

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

202-
use super::{doc_locator::tests::create_dummy_doc_locator, *};
202+
use super::*;
203+
use crate::{ContentType, builder::Builder};
203204

204205
pub(crate) fn create_dummy_doc_ref() -> DocumentRef {
205-
DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator())
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")
206222
}
207223

208224
#[test_case(
@@ -252,16 +268,17 @@ pub(crate) mod tests {
252268
#[test_case(
253269
CompatibilityPolicy::Accept,
254270
{
271+
let doc_ref = create_dummy_doc_ref();
255272
let mut e = Encoder::new(Vec::new());
256273
e.array(1)
257274
.unwrap()
258275
.array(3)
259276
.unwrap()
260-
.encode_with(UuidV7::new(), &mut CborContext::Untagged)
277+
.encode_with(*doc_ref.id(), &mut CborContext::Untagged)
261278
.unwrap()
262-
.encode_with(UuidV7::new(), &mut CborContext::Untagged)
279+
.encode_with(*doc_ref.ver(), &mut CborContext::Untagged)
263280
.unwrap()
264-
.encode(create_dummy_doc_locator())
281+
.encode(doc_ref.doc_locator().clone())
265282
.unwrap();
266283
e
267284
} ;

‎rust/signed_doc/src/validator/rules/ownership/tests/ref_field_based.rs‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use ed25519_dalek::ed25519::signature::Signer;
66
use test_case::test_case;
77

88
use crate::{
9-
CatalystSignedDocument, DocumentRef,
9+
CatalystSignedDocument,
1010
builder::tests::Builder,
11-
metadata::{SupportedField, document_refs::doc_locator::tests::create_dummy_doc_locator},
11+
metadata::SupportedField,
1212
providers::tests::TestCatalystProvider,
1313
validator::rules::{DocumentOwnershipRule, utils::create_dummy_key_pair},
1414
};
@@ -30,13 +30,7 @@ use crate::{
3030
.with_metadata_field(SupportedField::Id(id))
3131
.with_metadata_field(SupportedField::Ver(id))
3232
.with_metadata_field(SupportedField::Ref(
33-
vec![
34-
DocumentRef::new(
35-
doc.doc_id().unwrap(),
36-
doc.doc_ver().unwrap(),
37-
create_dummy_doc_locator()
38-
)
39-
].into()
33+
vec![doc.doc_ref().unwrap()].into()
4034
))
4135
.add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone())
4236
.unwrap()
@@ -63,13 +57,7 @@ use crate::{
6357
.with_metadata_field(SupportedField::Id(id))
6458
.with_metadata_field(SupportedField::Ver(id))
6559
.with_metadata_field(SupportedField::Ref(
66-
vec![
67-
DocumentRef::new(
68-
doc.doc_id().unwrap(),
69-
doc.doc_ver().unwrap(),
70-
create_dummy_doc_locator()
71-
)
72-
].into()
60+
vec![doc.doc_ref().unwrap()].into()
7361
))
7462
.add_signature(|m| c_sk.sign(&m).to_vec(), c_kid.clone())
7563
.unwrap()
@@ -118,13 +106,7 @@ use crate::{
118106
.with_metadata_field(SupportedField::Id(id))
119107
.with_metadata_field(SupportedField::Ver(id))
120108
.with_metadata_field(SupportedField::Ref(
121-
vec![
122-
DocumentRef::new(
123-
doc.doc_id().unwrap(),
124-
doc.doc_ver().unwrap(),
125-
create_dummy_doc_locator()
126-
)
127-
].into()
109+
vec![doc.doc_ref().unwrap()].into()
128110
))
129111
.add_signature(|m| a_sk.sign(&m).to_vec(), a_kid.clone())
130112
.unwrap()

‎rust/signed_doc/src/validator/rules/signature/tests.rs‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ use ed25519_dalek::ed25519::signature::Signer;
55

66
use super::*;
77
use crate::{
8-
metadata::document_refs::{DocumentRef, doc_locator::tests::create_dummy_doc_locator},
9-
providers::tests::*,
10-
validator::rules::utils::create_dummy_key_pair,
11-
*,
8+
metadata::document_refs::tests::create_dummy_doc_ref, providers::tests::*,
9+
validator::rules::utils::create_dummy_key_pair, *,
1210
};
1311

1412
fn metadata() -> serde_json::Value {
15-
let ref_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator());
16-
let reply_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator());
17-
let template_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator());
18-
let parameters_doc = DocumentRef::new(UuidV7::new(), UuidV7::new(), create_dummy_doc_locator());
13+
let ref_doc = create_dummy_doc_ref();
14+
let reply_doc = create_dummy_doc_ref();
15+
let template_doc = create_dummy_doc_ref();
16+
let parameters_doc = create_dummy_doc_ref();
1917

2018
serde_json::json!({
2119
"content-type": ContentType::Json.to_string(),
@@ -204,14 +202,7 @@ fn parameters_alias_field(
204202
e.bytes(m_p_headers.as_slice())?;
205203
// empty unprotected headers
206204
e.map(1)?;
207-
e.str(alias)?.encode_with(
208-
DocumentRef::new(
209-
UuidV7::new(),
210-
UuidV7::new(),
211-
crate::metadata::document_refs::doc_locator::tests::create_dummy_doc_locator(),
212-
),
213-
&mut (),
214-
)?;
205+
e.str(alias)?.encode_with(create_dummy_doc_ref(), &mut ())?;
215206
// content (random bytes)
216207
let content = [1, 2, 3];
217208
e.bytes(&content)?;

0 commit comments

Comments
 (0)