From 0a8b2cf41fa56329738597a12eedb371890c9c39 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 25 Sep 2025 10:44:56 +0400 Subject: [PATCH 1/2] change document validation rules initialisation --- rust/signed_doc/src/validator/mod.rs | 11 +++++++---- rust/signed_doc/src/validator/rules/parameters.rs | 1 + rust/signed_doc/src/validator/rules/section.rs | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rust/signed_doc/src/validator/mod.rs b/rust/signed_doc/src/validator/mod.rs index 4bed4304a89..33e6a061002 100644 --- a/rust/signed_doc/src/validator/mod.rs +++ b/rust/signed_doc/src/validator/mod.rs @@ -61,7 +61,7 @@ fn document_rules_init() -> HashMap { }, parameters: ParametersRule::Specified { exp_parameters_type: expect_uuidv4(CATEGORY_DOCUMENT_UUID_TYPE), - optional: true, + optional: false, }, doc_ref: RefRule::NotSpecified, reply: ReplyRule::NotSpecified, @@ -92,8 +92,11 @@ fn document_rules_init() -> HashMap { exp_reply_type: expect_uuidv4(COMMENT_DOCUMENT_UUID_TYPE), optional: true, }, - section: SectionRule::Specified { optional: true }, - parameters: ParametersRule::NotSpecified, + parameters: ParametersRule::Specified { + exp_parameters_type: expect_uuidv4(CATEGORY_DOCUMENT_UUID_TYPE), + optional: false, + }, + section: SectionRule::NotSpecified, kid: SignatureKidRule { exp: &[RoleId::Role0], }, @@ -120,7 +123,7 @@ fn document_rules_init() -> HashMap { content: ContentRule::Static(ContentSchema::Json(proposal_action_json_schema)), parameters: ParametersRule::Specified { exp_parameters_type: expect_uuidv4(CATEGORY_DOCUMENT_UUID_TYPE), - optional: true, + optional: false, }, doc_ref: RefRule::Specified { exp_ref_type: expect_uuidv4(PROPOSAL_DOCUMENT_UUID_TYPE), diff --git a/rust/signed_doc/src/validator/rules/parameters.rs b/rust/signed_doc/src/validator/rules/parameters.rs index 290d158439d..488f9cbae81 100644 --- a/rust/signed_doc/src/validator/rules/parameters.rs +++ b/rust/signed_doc/src/validator/rules/parameters.rs @@ -19,6 +19,7 @@ pub(crate) enum ParametersRule { optional: bool, }, /// `parameters` is not specified + #[allow(dead_code)] NotSpecified, } diff --git a/rust/signed_doc/src/validator/rules/section.rs b/rust/signed_doc/src/validator/rules/section.rs index 87203534254..b31b7fe0fb5 100644 --- a/rust/signed_doc/src/validator/rules/section.rs +++ b/rust/signed_doc/src/validator/rules/section.rs @@ -5,6 +5,7 @@ use crate::CatalystSignedDocument; /// `section` field validation rule pub(crate) enum SectionRule { /// Is 'section' specified + #[allow(dead_code)] Specified { /// optional flag for the `section` field optional: bool, From 1a558b1a33055b9776064ae28e1b648d1e688b59 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Thu, 25 Sep 2025 13:58:54 +0400 Subject: [PATCH 2/2] revert --- rust/signed_doc/src/validator/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/signed_doc/src/validator/mod.rs b/rust/signed_doc/src/validator/mod.rs index 33e6a061002..167f56cfa2a 100644 --- a/rust/signed_doc/src/validator/mod.rs +++ b/rust/signed_doc/src/validator/mod.rs @@ -96,7 +96,7 @@ fn document_rules_init() -> HashMap { exp_parameters_type: expect_uuidv4(CATEGORY_DOCUMENT_UUID_TYPE), optional: false, }, - section: SectionRule::NotSpecified, + section: SectionRule::Specified { optional: true }, kid: SignatureKidRule { exp: &[RoleId::Role0], },