Hmmm … maybe this doesn't need to be so complicated

Author: scouten-adobe

c2pa_c_ffi/src/c_api.rs

@@ -463,11 +463,6 @@ pub unsafe extern "C" fn c2pa_free_string_array(ptr: *const *const c_char, count
 
 // Run CAWG post-validation - this is async and requires a runtime.
 fn post_validate(result: Result<C2paReader, c2pa::Error>) -> Result<C2paReader, c2pa::Error> {
-    if false {
-        // CONSIDER BEFORE MERGING ...
-        todo!("Remove me?");
-    }
-
     match result {
         Ok(mut reader) => {
             let runtime = match Runtime::new() {

c2pa_c_ffi/src/json_api.rs

@@ -24,10 +24,6 @@ use crate::{Error, Result, SignerInfo};
 pub fn read_file(path: &str, data_dir: Option<String>) -> Result<String> {
     let mut reader = Reader::from_file(path).map_err(Error::from_c2pa_error)?;
     let runtime = Runtime::new().map_err(|e| Error::Other(e.to_string()))?;
-    if false {
-        // CONSIDER BEFORE MERGING ...
-        todo!("Remove post_validate_async here?");
-    }
     runtime
         .block_on(reader.post_validate_async(&CawgValidator {}))
         .map_err(Error::from_c2pa_error)?;

cli/src/main.rs

@@ -574,10 +574,6 @@ fn verify_fragmented(init_pattern: &Path, frag_pattern: &Path) -> Result<Vec<Rea
 
 // run cawg validation if supported
 fn validate_cawg(reader: &mut Reader) -> Result<()> {
-    if false {
-        // CONSIDER BEFORE MERGING ...
-        todo!("Remove me?");
-    }
     #[cfg(not(target_os = "wasi"))]
     {
         Runtime::new()?

sdk/examples/cawg_identity.rs

@@ -124,8 +124,7 @@ mod cawg {
 
         builder.sign_file_async(&signer, source, &dest).await?;
 
-        let reader = Reader::from_file_async(dest).await?;
-
+        let reader = Reader::from_file_with_cawg_async(dest).await?;
         println!("{reader}");
         Ok(())
     }

sdk/src/identity/validator.rs

@@ -77,10 +77,13 @@ mod tests {
         crate::settings::set_settings_value("verify.verify_trust", false).unwrap();
 
         let mut stream = Cursor::new(CONNECTED_IDENTITIES_VALID);
-        let reader = Reader::from_stream_async("image/jpeg", &mut stream)
+
+        let reader = Reader::from_stream_with_cawg_async("image/jpeg", &mut stream)
             .await
             .unwrap();
+
         //println!("validation results: {}", reader);
+
         assert_eq!(
             reader
                 .validation_results()
@@ -100,10 +103,13 @@ mod tests {
         crate::settings::set_settings_value("verify.verify_trust", false).unwrap();
 
         let mut stream = Cursor::new(MULTIPLE_IDENTITIES_VALID);
-        let reader = Reader::from_stream_async("image/jpeg", &mut stream)
+
+        let reader = Reader::from_stream_with_cawg_async("image/jpeg", &mut stream)
             .await
             .unwrap();
+
         println!("validation results: {reader}");
+
         assert_eq!(
             reader
                 .validation_results()
@@ -119,9 +125,11 @@ mod tests {
     #[c2pa_test_async]
     async fn test_cawg_validate_with_hard_binding_missing() {
         let mut stream = Cursor::new(NO_HARD_BINDING);
-        let reader = Reader::from_stream_async("image/jpeg", &mut stream)
+
+        let reader = Reader::from_stream_with_cawg_async("image/jpeg", &mut stream)
             .await
             .unwrap();
+
         assert_eq!(
             reader
                 .validation_results()

sdk/src/identity/x509/x509_credential_holder.rs

@@ -134,15 +134,16 @@ mod tests {
         // Read back the Manifest that was generated.
         dest.rewind().unwrap();
 
-        let manifest_store = Reader::from_stream_async(format, &mut dest).await.unwrap();
+        let manifest_store = Reader::from_stream_with_cawg_async(format, &mut dest)
+            .await
+            .unwrap();
+
         assert_eq!(manifest_store.validation_status(), None);
 
         let validation_results = manifest_store.validation_results().unwrap();
         let active_manifest_results = validation_results.active_manifest().unwrap();
         let active_manifest_success_codes = active_manifest_results.success();
 
-        dbg!(&active_manifest_success_codes);
-
         let mut ia_success_codes = active_manifest_success_codes.iter().filter(|s| {
             s.url()
                 .map(|url| url.ends_with("cawg.identity"))
@@ -151,8 +152,6 @@ mod tests {
         });
 
         let ia_success = ia_success_codes.next().unwrap();
-        dbg!(&ia_success);
-
         assert_eq!(ia_success.code(), "signingCredential.trusted");
         assert!(ia_success.url().unwrap().ends_with("cawg.identity"));
         assert_eq!(ia_success.kind(), &LogKind::Success);