diff --git a/validation/api/src/external.rs b/validation/api/src/external.rs index e5b9cb0..4d19bef 100644 --- a/validation/api/src/external.rs +++ b/validation/api/src/external.rs @@ -46,7 +46,7 @@ impl Context{ ).await.map_err(Error::Response)? .json().await.map_err(Error::ReqwestJson) } - pub async fn get_script_from_hash(&self,config:HashRequest<'_>)->Result,SingleItemError>{ + pub async fn get_script_from_hash(&self,config:HashRequest<'_>)->Result,ScriptSingleItemError>{ let scripts=self.get_scripts(GetScriptsRequest{ Page:1, Limit:2, @@ -57,7 +57,7 @@ impl Context{ ResourceID:None, }).await.map_err(SingleItemError::Other)?; if 1)->Result,SingleItemError>{ + pub async fn get_script_policy_from_hash(&self,config:HashRequest<'_>)->Result,ScriptPolicySingleItemError>{ let policies=self.get_script_policies(GetScriptPoliciesRequest{ Page:1, Limit:2, @@ -115,7 +115,7 @@ impl Context{ Policy:None, }).await.map_err(SingleItemError::Other)?; if 1)->Result,SingleItemError>{ + pub async fn get_script_from_hash(&self,config:HashRequest<'_>)->Result,ScriptSingleItemError>{ let scripts=self.get_scripts(GetScriptsRequest{ Page:1, Limit:2, @@ -87,7 +87,7 @@ impl Context{ ResourceID:None, }).await.map_err(SingleItemError::Other)?; if 1)->Result,SingleItemError>{ + pub async fn get_script_policy_from_hash(&self,config:HashRequest<'_>)->Result,ScriptPolicySingleItemError>{ let policies=self.get_script_policies(GetScriptPoliciesRequest{ Page:1, Limit:2, @@ -135,7 +135,7 @@ impl Context{ Policy:None, }).await.map_err(SingleItemError::Other)?; if 1{ + DuplicateItems(Items), Other(Error), } -impl std::fmt::Display for SingleItemError{ +impl std::fmt::Display for SingleItemError +where + Items:std::fmt::Debug +{ fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{ write!(f,"{self:?}") } } -impl std::error::Error for SingleItemError{} +impl std::error::Error for SingleItemError where Items:std::fmt::Debug{} +pub type ScriptSingleItemError=SingleItemError>; +pub type ScriptPolicySingleItemError=SingleItemError>; #[allow(dead_code)] #[derive(Debug)] diff --git a/validation/src/validator.rs b/validation/src/validator.rs index 26ac08c..e5ef087 100644 --- a/validation/src/validator.rs +++ b/validation/src/validator.rs @@ -39,11 +39,11 @@ pub enum Error{ ScriptNotYetReviewed(Option), Download(crate::download::Error), ModelFileDecode(ReadDomError), - ApiGetScriptPolicyFromHash(submissions_api::types::SingleItemError), + ApiGetScriptPolicyFromHash(submissions_api::types::ScriptPolicySingleItemError), ApiGetScript(submissions_api::Error), ApiCreateScript(submissions_api::Error), ApiCreateScriptPolicy(submissions_api::Error), - ApiGetScriptFromHash(submissions_api::types::SingleItemError), + ApiGetScriptFromHash(submissions_api::types::ScriptSingleItemError), ApiUpdateMapfixModel(submissions_api::Error), ApiUpdateSubmissionModel(submissions_api::Error), ModelFileRootMustHaveOneChild,