Skip to content

Commit 46cd580

Browse files
saibatizokusaibatizoku
committed
fix(rust/signed-doc): fix integration tests
1 parent 99bfa3e commit 46cd580

22 files changed

+309
-357
lines changed

‎rust/signed_doc/tests/brand_parameters.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ mod common;
2727
let id = UuidV7::new();
2828
let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0));
2929
provider.add_sk(kid.clone(), sk.clone());
30+
31+
let template_ref = DocumentRef::try_from(&template)?;
32+
3033
Builder::new()
3134
.with_json_metadata(serde_json::json!({
3235
"content-type": ContentType::Json,
3336
"content-encoding": ContentEncoding::Brotli,
3437
"id": id,
3538
"ver": id,
3639
"type": doc_types::BRAND_PARAMETERS.clone(),
37-
"template": {
38-
"id": template.doc_id()?,
39-
"ver": template.doc_ver()?,
40-
},
40+
"template": [template_ref],
4141
}))?
4242
.with_json_content(&serde_json::json!({}))?
4343
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -53,17 +53,17 @@ mod common;
5353
let id = UuidV7::new();
5454
let (sk, kid) = create_dummy_key_pair(None);
5555
provider.add_sk(kid.clone(), sk.clone());
56+
57+
let template_ref = DocumentRef::try_from(&template)?;
58+
5659
Builder::new()
5760
.with_json_metadata(serde_json::json!({
5861
"content-type": ContentType::Json,
5962
"content-encoding": ContentEncoding::Brotli,
6063
"id": id,
6164
"ver": id,
6265
"type": doc_types::BRAND_PARAMETERS.clone(),
63-
"template": {
64-
"id": template.doc_id()?,
65-
"ver": template.doc_ver()?,
66-
},
66+
"template": [template_ref],
6767
}))?
6868
.empty_content()?
6969
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -79,17 +79,17 @@ mod common;
7979
let id = UuidV7::new();
8080
let (sk, kid) = create_dummy_key_pair(None);
8181
provider.add_sk(kid.clone(), sk.clone());
82+
83+
let template_ref = DocumentRef::try_from(&template)?;
84+
8285
Builder::new()
8386
.with_json_metadata(serde_json::json!({
8487
"content-type": ContentType::Json,
8588
"content-encoding": ContentEncoding::Brotli,
8689
"id": id,
8790
"ver": id,
8891
"type": doc_types::BRAND_PARAMETERS.clone(),
89-
"template": {
90-
"id": template.doc_id()?,
91-
"ver": template.doc_ver()?,
92-
},
92+
"template": [template_ref],
9393
}))?
9494
.with_json_content(&serde_json::json!({}))?
9595
.add_signature(|m| sk.sign(&m).to_vec(), kid)?

‎rust/signed_doc/tests/campaign_parameters.rs‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,19 @@ mod common;
3232
let id = UuidV7::new();
3333
let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0));
3434
provider.add_sk(kid.clone(), sk.clone());
35+
36+
let template_ref = DocumentRef::try_from(&template)?;
37+
let parameters_ref = DocumentRef::try_from(&parameters)?;
38+
3539
Builder::new()
3640
.with_json_metadata(serde_json::json!({
3741
"content-type": ContentType::Json,
3842
"content-encoding": ContentEncoding::Brotli,
3943
"id": id,
4044
"ver": id,
4145
"type": doc_types::CAMPAIGN_PARAMETERS.clone(),
42-
"template": {
43-
"id": template.doc_id()?,
44-
"ver": template.doc_ver()?,
45-
},
46-
"parameters": {
47-
"id": parameters.doc_id()?,
48-
"ver": parameters.doc_ver()?,
49-
}
46+
"template": [template_ref],
47+
"parameters": [parameters_ref]
5048
}))?
5149
.with_json_content(&serde_json::json!({}))?
5250
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -64,21 +62,19 @@ mod common;
6462
let id = UuidV7::new();
6563
let (sk, kid) = create_dummy_key_pair(None);
6664
provider.add_sk(kid.clone(), sk.clone());
65+
66+
let template_ref = DocumentRef::try_from(&template)?;
67+
let parameters_ref = DocumentRef::try_from(&parameters)?;
68+
6769
Builder::new()
6870
.with_json_metadata(serde_json::json!({
6971
"content-type": ContentType::Json,
7072
"content-encoding": ContentEncoding::Brotli,
7173
"id": id,
7274
"ver": id,
7375
"type": doc_types::CAMPAIGN_PARAMETERS.clone(),
74-
"template": {
75-
"id": template.doc_id()?,
76-
"ver": template.doc_ver()?,
77-
},
78-
"parameters": {
79-
"id": parameters.doc_id()?,
80-
"ver": parameters.doc_ver()?,
81-
}
76+
"template": [template_ref],
77+
"parameters": [parameters_ref]
8278
}))?
8379
.empty_content()?
8480
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -96,20 +92,18 @@ mod common;
9692
let id = UuidV7::new();
9793
let (sk, kid) = create_dummy_key_pair(None);
9894
provider.add_sk(kid.clone(), sk.clone());
95+
96+
let template_ref = DocumentRef::try_from(&template)?;
97+
let parameters_ref = DocumentRef::try_from(&parameters)?;
98+
9999
Builder::new()
100100
.with_json_metadata(serde_json::json!({
101101
"content-type": ContentType::Json,
102102
"id": id,
103103
"ver": id,
104104
"type": doc_types::CAMPAIGN_PARAMETERS.clone(),
105-
"template": {
106-
"id": template.doc_id()?,
107-
"ver": template.doc_ver()?,
108-
},
109-
"parameters": {
110-
"id": parameters.doc_id()?,
111-
"ver": parameters.doc_ver()?,
112-
}
105+
"template": [template_ref],
106+
"parameters": [parameters_ref]
113107
}))?
114108
.with_json_content(&serde_json::json!({}))?
115109
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -126,17 +120,17 @@ mod common;
126120
let id = UuidV7::new();
127121
let (sk, kid) = create_dummy_key_pair(None);
128122
provider.add_sk(kid.clone(), sk.clone());
123+
124+
let parameters_ref = DocumentRef::try_from(&parameters)?;
125+
129126
Builder::new()
130127
.with_json_metadata(serde_json::json!({
131128
"content-type": ContentType::Json,
132129
"content-encoding": ContentEncoding::Brotli,
133130
"id": id,
134131
"ver": id,
135132
"type": doc_types::CAMPAIGN_PARAMETERS.clone(),
136-
"parameters": {
137-
"id": parameters.doc_id()?,
138-
"ver": parameters.doc_ver()?,
139-
}
133+
"parameters": [parameters_ref]
140134
}))?
141135
.with_json_content(&serde_json::json!({}))?
142136
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -154,17 +148,17 @@ mod common;
154148
let id = UuidV7::new();
155149
let (sk, kid) = create_dummy_key_pair(None);
156150
provider.add_sk(kid.clone(), sk.clone());
151+
152+
let template_ref = DocumentRef::try_from(&template)?;
153+
157154
Builder::new()
158155
.with_json_metadata(serde_json::json!({
159156
"content-type": ContentType::Json,
160157
"content-encoding": ContentEncoding::Brotli,
161158
"id": id,
162159
"ver": id,
163160
"type": doc_types::CAMPAIGN_PARAMETERS.clone(),
164-
"template": {
165-
"id": template.doc_id()?,
166-
"ver": template.doc_ver()?,
167-
},
161+
"template": [template_ref],
168162
}))?
169163
.with_json_content(&serde_json::json!({}))?
170164
.add_signature(|m| sk.sign(&m).to_vec(), kid)?

‎rust/signed_doc/tests/campaign_parameters_form_template.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ mod common;
3030
let id = UuidV7::new();
3131
let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0));
3232
provider.add_sk(kid.clone(), sk.clone());
33+
34+
let parameters_ref = DocumentRef::try_from(&parameters)?;
35+
3336
Builder::new()
3437
.with_json_metadata(serde_json::json!({
3538
"content-type": ContentType::SchemaJson,
3639
"content-encoding": ContentEncoding::Brotli,
3740
"id": id,
3841
"ver": id,
3942
"type": doc_types::CAMPAIGN_PARAMETERS_FORM_TEMPLATE.clone(),
40-
"parameters": {
41-
"id": parameters.doc_id()?,
42-
"ver": parameters.doc_ver()?,
43-
}
43+
"parameters": [parameters_ref]
4444
}))?
4545
.with_json_content(&serde_json::json!({}))?
4646
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -57,17 +57,17 @@ mod common;
5757
let id = UuidV7::new();
5858
let (sk, kid) = create_dummy_key_pair(None);
5959
provider.add_sk(kid.clone(), sk.clone());
60+
61+
let parameters_ref = DocumentRef::try_from(&parameters)?;
62+
6063
Builder::new()
6164
.with_json_metadata(serde_json::json!({
6265
"content-type": ContentType::SchemaJson,
6366
"content-encoding": ContentEncoding::Brotli,
6467
"id": id,
6568
"ver": id,
6669
"type": doc_types::CAMPAIGN_PARAMETERS_FORM_TEMPLATE.clone(),
67-
"parameters": {
68-
"id": parameters.doc_id()?,
69-
"ver": parameters.doc_ver()?,
70-
}
70+
"parameters": [parameters_ref]
7171
}))?
7272
.empty_content()?
7373
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -84,16 +84,16 @@ mod common;
8484
let id = UuidV7::new();
8585
let (sk, kid) = create_dummy_key_pair(None);
8686
provider.add_sk(kid.clone(), sk.clone());
87+
88+
let parameters_ref = DocumentRef::try_from(&parameters)?;
89+
8790
Builder::new()
8891
.with_json_metadata(serde_json::json!({
8992
"content-type": ContentType::SchemaJson,
9093
"id": id,
9194
"ver": id,
9295
"type": doc_types::CAMPAIGN_PARAMETERS_FORM_TEMPLATE.clone(),
93-
"parameters": {
94-
"id": parameters.doc_id()?,
95-
"ver": parameters.doc_ver()?,
96-
}
96+
"parameters": [parameters_ref]
9797
}))?
9898
.with_json_content(&serde_json::json!({}))?
9999
.add_signature(|m| sk.sign(&m).to_vec(), kid)?

‎rust/signed_doc/tests/category_parameters.rs‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,19 @@ mod common;
3737
let id = UuidV7::new();
3838
let (sk, kid) = create_dummy_key_pair(Some(RoleId::Role0));
3939
provider.add_sk(kid.clone(), sk.clone());
40+
41+
let template_ref = DocumentRef::try_from(&template)?;
42+
let parameters_ref = DocumentRef::try_from(&parameters)?;
43+
4044
Builder::new()
4145
.with_json_metadata(serde_json::json!({
4246
"content-type": ContentType::Json,
4347
"content-encoding": ContentEncoding::Brotli,
4448
"id": id,
4549
"ver": id,
4650
"type": doc_types::CATEGORY_PARAMETERS.clone(),
47-
"template": {
48-
"id": template.doc_id()?,
49-
"ver": template.doc_ver()?,
50-
},
51-
"parameters": {
52-
"id": parameters.doc_id()?,
53-
"ver": parameters.doc_ver()?,
54-
}
51+
"template": [template_ref],
52+
"parameters": [parameters_ref]
5553
}))?
5654
.with_json_content(&serde_json::json!({}))?
5755
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -71,21 +69,19 @@ mod common;
7169
let id = UuidV7::new();
7270
let (sk, kid) = create_dummy_key_pair(None);
7371
provider.add_sk(kid.clone(), sk.clone());
72+
73+
let template_ref = DocumentRef::try_from(&template)?;
74+
let parameters_ref = DocumentRef::try_from(&parameters)?;
75+
7476
Builder::new()
7577
.with_json_metadata(serde_json::json!({
7678
"content-type": ContentType::Json,
7779
"content-encoding": ContentEncoding::Brotli,
7880
"id": id,
7981
"ver": id,
8082
"type": doc_types::CATEGORY_PARAMETERS.clone(),
81-
"template": {
82-
"id": template.doc_id()?,
83-
"ver": template.doc_ver()?,
84-
},
85-
"parameters": {
86-
"id": parameters.doc_id()?,
87-
"ver": parameters.doc_ver()?,
88-
}
83+
"template": [template_ref],
84+
"parameters": [parameters_ref]
8985
}))?
9086
.empty_content()?
9187
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -105,20 +101,18 @@ mod common;
105101
let id = UuidV7::new();
106102
let (sk, kid) = create_dummy_key_pair(None);
107103
provider.add_sk(kid.clone(), sk.clone());
104+
105+
let template_ref = DocumentRef::try_from(&template)?;
106+
let parameters_ref = DocumentRef::try_from(&parameters)?;
107+
108108
Builder::new()
109109
.with_json_metadata(serde_json::json!({
110110
"content-type": ContentType::Json,
111111
"id": id,
112112
"ver": id,
113113
"type": doc_types::CATEGORY_PARAMETERS.clone(),
114-
"template": {
115-
"id": template.doc_id()?,
116-
"ver": template.doc_ver()?,
117-
},
118-
"parameters": {
119-
"id": parameters.doc_id()?,
120-
"ver": parameters.doc_ver()?,
121-
}
114+
"template": [template_ref],
115+
"parameters": [parameters_ref]
122116
}))?
123117
.with_json_content(&serde_json::json!({}))?
124118
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -137,17 +131,17 @@ mod common;
137131
let id = UuidV7::new();
138132
let (sk, kid) = create_dummy_key_pair(None);
139133
provider.add_sk(kid.clone(), sk.clone());
134+
135+
let parameters_ref = DocumentRef::try_from(&parameters)?;
136+
140137
Builder::new()
141138
.with_json_metadata(serde_json::json!({
142139
"content-type": ContentType::Json,
143140
"content-encoding": ContentEncoding::Brotli,
144141
"id": id,
145142
"ver": id,
146143
"type": doc_types::CATEGORY_PARAMETERS.clone(),
147-
"parameters": {
148-
"id": parameters.doc_id()?,
149-
"ver": parameters.doc_ver()?,
150-
}
144+
"parameters": [parameters_ref]
151145
}))?
152146
.with_json_content(&serde_json::json!({}))?
153147
.add_signature(|m| sk.sign(&m).to_vec(), kid)?
@@ -167,17 +161,17 @@ mod common;
167161
let id = UuidV7::new();
168162
let (sk, kid) = create_dummy_key_pair(None);
169163
provider.add_sk(kid.clone(), sk.clone());
164+
165+
let template_ref = DocumentRef::try_from(&template)?;
166+
170167
Builder::new()
171168
.with_json_metadata(serde_json::json!({
172169
"content-type": ContentType::Json,
173170
"content-encoding": ContentEncoding::Brotli,
174171
"id": id,
175172
"ver": id,
176173
"type": doc_types::CATEGORY_PARAMETERS.clone(),
177-
"template": {
178-
"id": template.doc_id()?,
179-
"ver": template.doc_ver()?,
180-
},
174+
"template": [template_ref],
181175
}))?
182176
.with_json_content(&serde_json::json!({}))?
183177
.add_signature(|m| sk.sign(&m).to_vec(), kid)?

0 commit comments

Comments
 (0)