Skip to content

Commit 1da1fa1

Browse files
Mr-LeshiyMr-Leshiy
committed
wip
1 parent e48d5d4 commit 1da1fa1

File tree

6 files changed

+91
-31
lines changed

6 files changed

+91
-31
lines changed

‎rust/signed_doc/tests/common/category_parameters.rs‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
1+
use catalyst_signed_doc::providers::tests::TestCatalystProvider;
2+
use ed25519_dalek::ed25519::signature::Signer;
3+
14
use super::*;
25

3-
pub fn category_parameters_doc() -> anyhow::Result<CatalystSignedDocument> {
6+
pub fn category_parameters_doc(
7+
template: &CatalystSignedDocument,
8+
parameters: &CatalystSignedDocument,
9+
provider: &mut TestCatalystProvider,
10+
) -> anyhow::Result<CatalystSignedDocument> {
11+
let id = UuidV7::new();
12+
let (sk, _, kid) = create_dummy_key_pair(RoleId::BrandAdmin)
13+
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
414
Builder::new()
515
.with_json_metadata(serde_json::json!({
616
"content-type": ContentType::Json,
7-
"id": UuidV7::new(),
8-
"ver": UuidV7::new(),
17+
"content-encoding": ContentEncoding::Brotli,
18+
"id": id,
19+
"ver": id,
920
"type": doc_types::CATEGORY_PARAMETERS.clone(),
21+
"template": {
22+
"id": template.doc_id()?,
23+
"ver": template.doc_ver()?,
24+
},
25+
"parameters": {
26+
"id": parameters.doc_id()?,
27+
"ver": parameters.doc_ver()?,
28+
}
1029
}))?
11-
.empty_content()?
30+
.with_json_content(&serde_json::json!({}))?
31+
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
1232
.build()
1333
}

‎rust/signed_doc/tests/proposal.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ use test_case::test_case;
99

1010
use crate::common::{
1111
brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc,
12-
campaign_parameters_form_template_doc, category_parameters_doc, create_dummy_key_pair,
13-
proposal_doc, proposal_form_template_doc,
12+
campaign_parameters_form_template_doc, category_parameters_doc,
13+
category_parameters_form_template_doc, create_dummy_key_pair, proposal_doc,
14+
proposal_form_template_doc,
1415
};
1516

1617
mod common;
@@ -41,7 +42,12 @@ mod common;
4142
)]
4243
#[test_case(
4344
|provider| {
44-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
45+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
46+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
47+
let template = campaign_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
48+
let parameters = campaign_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
49+
let template = category_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
50+
let parameters = category_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4551
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4652
proposal_doc(&template, &parameters, provider)
4753
}

‎rust/signed_doc/tests/proposal_comment.rs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use test_case::test_case;
99

1010
use crate::common::{
1111
brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc,
12-
campaign_parameters_form_template_doc, category_parameters_doc, create_dummy_key_pair,
13-
proposal_comment_doc, proposal_comment_form_template_doc, proposal_doc,
14-
proposal_form_template_doc,
12+
campaign_parameters_form_template_doc, category_parameters_doc,
13+
category_parameters_form_template_doc, create_dummy_key_pair, proposal_comment_doc,
14+
proposal_comment_form_template_doc, proposal_doc, proposal_form_template_doc,
1515
};
1616

1717
mod common;
@@ -46,7 +46,12 @@ mod common;
4646
)]
4747
#[test_case(
4848
|provider| {
49-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
49+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
50+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
51+
let template = campaign_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
52+
let parameters = campaign_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
53+
let template = category_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
54+
let parameters = category_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5055
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5156
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5257
let template = proposal_comment_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;

‎rust/signed_doc/tests/proposal_comment_form_template.rs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ use test_case::test_case;
88

99
use crate::common::{
1010
brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc,
11-
campaign_parameters_form_template_doc, category_parameters_doc, create_dummy_key_pair,
11+
campaign_parameters_form_template_doc, category_parameters_doc,
12+
category_parameters_form_template_doc, create_dummy_key_pair,
1213
proposal_comment_form_template_doc,
1314
};
1415

@@ -38,7 +39,12 @@ mod common;
3839
)]
3940
#[test_case(
4041
|provider| {
41-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
42+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
43+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
44+
let template = campaign_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
45+
let parameters = campaign_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
46+
let template = category_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
47+
let parameters = category_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4248
proposal_comment_form_template_doc(&parameters, provider)
4349
}
4450
=> true
@@ -47,7 +53,8 @@ mod common;
4753
)]
4854
#[test_case(
4955
|provider| {
50-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
56+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
57+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5158
let id = UuidV7::new();
5259
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
5360
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
@@ -73,7 +80,8 @@ mod common;
7380
)]
7481
#[test_case(
7582
|provider| {
76-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
83+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
84+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
7785
let id = UuidV7::new();
7886
let (sk, _, kid) = create_dummy_key_pair(RoleId::BrandAdmin)
7987
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
@@ -99,7 +107,8 @@ mod common;
99107
)]
100108
#[test_case(
101109
|provider| {
102-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
110+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
111+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
103112
let id = UuidV7::new();
104113
let (sk, _, kid) = create_dummy_key_pair(RoleId::BrandAdmin)
105114
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;

‎rust/signed_doc/tests/proposal_form_template.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use test_case::test_case;
88

99
use crate::common::{
1010
brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc,
11-
campaign_parameters_form_template_doc, category_parameters_doc, create_dummy_key_pair,
12-
proposal_form_template_doc,
11+
campaign_parameters_form_template_doc, category_parameters_doc,
12+
category_parameters_form_template_doc, create_dummy_key_pair, proposal_form_template_doc,
1313
};
1414

1515
mod common;
@@ -38,7 +38,12 @@ mod common;
3838
)]
3939
#[test_case(
4040
|provider| {
41-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
41+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
42+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
43+
let template = campaign_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
44+
let parameters = campaign_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
45+
let template = category_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
46+
let parameters = category_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4247
proposal_form_template_doc(&parameters, provider)
4348
}
4449
=> true
@@ -47,7 +52,8 @@ mod common;
4752
)]
4853
#[test_case(
4954
|provider| {
50-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
55+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
56+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5157
let id = UuidV7::new();
5258
let (sk, _, kid) = create_dummy_key_pair(RoleId::Role0)
5359
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
@@ -73,7 +79,8 @@ mod common;
7379
)]
7480
#[test_case(
7581
|provider| {
76-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
82+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
83+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
7784
let id = UuidV7::new();
7885
let (sk, _, kid) = create_dummy_key_pair(RoleId::BrandAdmin)
7986
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
@@ -99,7 +106,8 @@ mod common;
99106
)]
100107
#[test_case(
101108
|provider| {
102-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
109+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
110+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
103111
let id = UuidV7::new();
104112
let (sk, _, kid) = create_dummy_key_pair(RoleId::BrandAdmin)
105113
.inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;

‎rust/signed_doc/tests/proposal_submission_action.rs‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ use test_case::test_case;
99

1010
use crate::common::{
1111
brand_parameters_doc, brand_parameters_form_template_doc, campaign_parameters_doc,
12-
campaign_parameters_form_template_doc, category_parameters_doc, create_dummy_key_pair,
13-
proposal_doc, proposal_form_template_doc, proposal_submission_action_doc,
12+
campaign_parameters_form_template_doc, category_parameters_doc,
13+
category_parameters_form_template_doc, create_dummy_key_pair, proposal_doc,
14+
proposal_form_template_doc, proposal_submission_action_doc,
1415
};
1516

1617
mod common;
@@ -43,7 +44,12 @@ mod common;
4344
)]
4445
#[test_case(
4546
|provider| {
46-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
47+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
48+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
49+
let template = campaign_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
50+
let parameters = campaign_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
51+
let template = category_parameters_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
52+
let parameters = category_parameters_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4753
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4854
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
4955
proposal_submission_action_doc(&proposal, &parameters, provider)
@@ -54,7 +60,8 @@ mod common;
5460
)]
5561
#[test_case(
5662
|provider| {
57-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
63+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
64+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5865
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
5966
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
6067
let id = UuidV7::new();
@@ -87,7 +94,8 @@ mod common;
8794
)]
8895
#[test_case(
8996
|provider| {
90-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
97+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
98+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
9199
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
92100
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
93101
let id = UuidV7::new();
@@ -119,7 +127,8 @@ mod common;
119127
)]
120128
#[test_case(
121129
|provider| {
122-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
130+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
131+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
123132
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
124133
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
125134
let id = UuidV7::new();
@@ -151,7 +160,8 @@ mod common;
151160
)]
152161
#[test_case(
153162
|provider| {
154-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
163+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
164+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
155165
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
156166
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
157167
let id = UuidV7::new();
@@ -184,7 +194,8 @@ mod common;
184194
)]
185195
#[test_case(
186196
|provider| {
187-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
197+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
198+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
188199
let id = UuidV7::new();
189200
let (sk, _, kid) = create_dummy_key_pair(RoleId::Proposer).inspect(|(_, pk, kid)| provider.add_pk(kid.clone(), *pk))?;
190201
let doc = Builder::new()
@@ -212,7 +223,8 @@ mod common;
212223
)]
213224
#[test_case(
214225
|provider| {
215-
let parameters = category_parameters_doc().inspect(|v| provider.add_document(None, v).unwrap())?;
226+
let template = brand_parameters_form_template_doc(provider).inspect(|v| provider.add_document(None, v).unwrap())?;
227+
let parameters = brand_parameters_doc(&template, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
216228
let template = proposal_form_template_doc(&parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
217229
let proposal = proposal_doc(&template, &parameters, provider).inspect(|v| provider.add_document(None, v).unwrap())?;
218230
let id = UuidV7::new();

0 commit comments

Comments
 (0)