Skip to content

Commit 0c764ec

Browse files
committed
chore: merge resolve
1 parent 50109bf commit 0c764ec

File tree

1 file changed

+6
-8
lines changed
  • rust/signed_doc/src/validator/rules/parameters

1 file changed

+6
-8
lines changed

rust/signed_doc/src/validator/rules/parameters/mod.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ use futures::FutureExt;
1313

1414
use crate::{
1515
CatalystSignedDocument, DocType, DocumentRef, DocumentRefs,
16-
providers::CatalystSignedDocumentProvider, validator::rules::doc_ref::doc_refs_check,
16+
providers::{CatalystSignedDocumentAndCatalystIdProvider, CatalystSignedDocumentProvider},
17+
validator::{CatalystSignedDocumentValidationRule, rules::doc_ref::doc_refs_check},
1718
};
1819

1920
/// `parameters` field validation rule
@@ -195,7 +196,7 @@ impl ParametersRule {
195196
/// - `Ok(true)` if `ref_field` is `None` or yield a matching parameter set.
196197
/// - `Ok(false)` if no recursive parameter set matches the expected one.
197198
/// - `Err` if an unexpected provider error occurs.
198-
pub(crate) async fn link_check<Provider>(
199+
pub(crate) async fn link_check(
199200
ref_field: Option<&DocumentRefs>,
200201
exp_parameters: &DocumentRefs,
201202
field_name: &str,
@@ -246,15 +247,12 @@ pub(crate) async fn link_check<Provider>(
246247
///
247248
/// All encountered parameter lists are returned; traversal is cycle-safe
248249
/// and explores deeper parameter references recursively.
249-
async fn collect_parameters_recursively<Provider>(
250+
async fn collect_parameters_recursively(
250251
root: &DocumentRef,
251252
field_name: &str,
252-
provider: &Provider,
253+
provider: &dyn CatalystSignedDocumentProvider,
253254
report: &ProblemReport,
254-
) -> anyhow::Result<(bool, HashSet<DocumentRefs>)>
255-
where
256-
Provider: CatalystSignedDocumentProvider,
257-
{
255+
) -> anyhow::Result<(bool, HashSet<DocumentRefs>)> {
258256
let mut all_valid = true;
259257
let mut result = HashSet::new();
260258
let mut visited = HashSet::new();

0 commit comments

Comments
 (0)