feat: remove the v1_api feature and all associated code (#1387)

* chore: WIP on removing the v1_api feature

* chore: get a lot more of the store unit tests running.

* chore: repair a few more tests
mime methods ignore case

* chore: move test settings to a function

* chore: more merge fixes

* chore: get almost all the unit tests building and running again.

* fix: Wasm file system changes in tests

* chore: fix build when file_io is not enabled.

* chore: adds lazyloaded includebytes assets for testing without file io

* chore: add more in-memory test images.

* chore: try something to get wasi to pass

* chore: fmt

* chore: fix logging Store::from_stream for invalid formats.

* chore: handle some unit test file:/// paths on windows better
clippy cleanup.

* chore: clean up unused dependencies

---------

Co-authored-by: Colin Murphy <[email protected]>

Author: gpeacock

Cargo.lock

@@ -23,7 +23,7 @@ clippy:
 	cargo clippy --features="file_io" --all-targets -- -D warnings
 
 test-local:
-	cargo test --features="file_io, fetch_remote_manifests, add_thumbnails, v1_api" --all-targets
+	cargo test --features="file_io, fetch_remote_manifests, add_thumbnails" --all-targets
 
 test-wasm:
 	cd sdk && wasm-pack test --node -- --no-default-features --features="rust_native_crypto, fetch_remote_manifests"
@@ -36,7 +36,7 @@ test-wasi:
 ifeq ($(PLATFORM),mac)
 	$(eval CC := /opt/homebrew/opt/llvm/bin/clang)
 endif
-	CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails, v1_api"
+	CC=$(CC) CARGO_TARGET_WASM32_WASIP2_RUNNER="wasmtime -S cli -S http --dir ." cargo +nightly test --target wasm32-wasip2 -p c2pa --no-default-features --features="rust_native_crypto, file_io, fetch_remote_manifests, add_thumbnails"
 	rm -r sdk/Users
 
 # Full local validation, build and test all features including wasm

Makefile

@@ -34,7 +34,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0.64"
 tokio = { version = "1.36", features = ["rt-multi-thread", "rt"] }
-zip = { version = "3.0.0", default-features = false, features = ["deflate"] }
 
 [dev-dependencies]
 tempfile = "3.7.0"

c2pa_c_ffi/Cargo.toml

@@ -33,7 +33,6 @@ env_logger = "0.11.7"
 glob = "0.3.1"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
-serde_derive = "1.0"
 serde_json = "1.0"
 toml = "0.8.23"
 tempfile = "3.3"

cli/Cargo.toml

@@ -42,22 +42,14 @@ The Rust library crate provides the following capabilities:
 * `json_schema` is used by `make schema` to produce a JSON schema document that represents the `ManifestStore` data structures.
 * `no_interleaved_io` forces fully-synchronous I/O; otherwise, the library uses threaded I/O for some operations to improve performance.
 * `serialize_thumbnails` includes binary thumbnail data in the [Serde](https://serde.rs/) serialization output.
-* `v1_api` - Use the old API (which will soon be deprecated) instead of the [new API](release-notes.md#new-api).
 * `pdf` - Enable support for reading claims on PDF files.
 
-> [!NOTE]
-> If both `rust_native_crypto` and `openssl` are enabled, it will default to `rust_native_crypto`.
-> It is recommended to disable default features when using `rust_native_crypto` as to avoid including `openssl` as a dependency.
+* the `v1_api` feature is no longer supported.
 
-### New API
+[!NOTE]
+If both `rust_native_crypto` and `openssl` are enabled, it will default to `rust_native_crypto`.
+It is recommended to disable default features when using `rust_native_crypto` as to avoid including `openssl` as a dependency.
 
-The new API is now enabled by default. The `unstable_api` feature is no longer available.
-
-To use the deprecated v1 API, enable the v1_api feature; for example:
-
-```
-c2pa = {version="0.43.0", features=["v1_api"]}
-```
 
 ### Resource references
 

docs/usage.md

@@ -19,7 +19,6 @@ c2pa = { path = "../sdk", version = "0.62.0", features = [
 	"pdf"
 ]}
 env_logger = "0.11"
-log = "0.4.8"
 lazy_static = "1.4.0"
 image = { version = "0.25.2", default-features = false, features = [
 	"jpeg",

make_test_images/Cargo.toml

@@ -49,7 +49,6 @@ rust_native_crypto = [
     "dep:rsa",
     "dep:spki",
 ]
-v1_api = []
 
 # The diagnostics feature is unsupported and might be removed.
 # It enables some low-overhead timing features used in our development cycle.
@@ -61,6 +60,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(test)'] }
 
 [[example]]
 name = "cawg_identity"
+required-features = ["file_io"]
 
 [[example]]
 name = "client"
@@ -169,7 +169,6 @@ spki = { version = "0.7.3", optional = true }
 static-iref = "3.0"
 tempfile = "=3.15.0"
 thiserror = "2.0.8"
-treeline = "0.1.0"
 url = "2.5.3"
 uuid = { version = "1.18.0", features = ["serde", "v4"] }
 web-time = "1.1"
@@ -278,6 +277,7 @@ hex-literal = "0.4.1"
 jumbf = "0.4.0"
 c2pa_macros = { path = "../macros" }
 mockall = "0.13.1"
+once_cell = "1.17.2"
 
 [target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dev-dependencies]
 wasm-bindgen-test = "0.3.45"

sdk/Cargo.toml

@@ -2313,42 +2313,6 @@ mod tests {
         }
     }
 
-    #[c2pa_test_async]
-    #[cfg(feature = "v1_api")]
-    async fn test_builder_remote_sign() {
-        let format = "image/jpeg";
-        let mut source = Cursor::new(TEST_IMAGE);
-        let mut dest = Cursor::new(Vec::new());
-
-        let mut builder = Builder::from_json(&simple_manifest_json()).unwrap();
-        builder
-            .add_ingredient_from_stream(parent_json(), format, &mut source)
-            .unwrap();
-
-        builder
-            .resources
-            .add("thumbnail.jpg", TEST_THUMBNAIL.to_vec())
-            .unwrap();
-
-        // sign the Builder and write it to the output stream
-        let signer = crate::utils::test::temp_async_remote_signer();
-        builder
-            .sign_async(signer.as_ref(), format, &mut source, &mut dest)
-            .await
-            .unwrap();
-
-        // read and validate the signed manifest store
-        dest.rewind().unwrap();
-        let manifest_store = Reader::from_stream(format, &mut dest).expect("from_bytes");
-
-        assert_eq!(manifest_store.validation_status(), None);
-
-        assert_eq!(
-            manifest_store.active_manifest().unwrap().title().unwrap(),
-            "Test_Manifest"
-        );
-    }
-
     #[test]
     #[cfg(feature = "file_io")]
     fn test_builder_remote_url() {
@@ -2437,7 +2401,7 @@ mod tests {
     }
 
     #[c2pa_test_async]
-    #[cfg(any(target_arch = "wasm32", feature = "file_io"))]
+    #[cfg(target_arch = "wasm32")]
     async fn test_builder_box_hashed_embeddable() {
         use crate::asset_io::{CAIWriter, HashBlockObjectType};
         const BOX_HASH_IMAGE: &[u8] = include_bytes!("../tests/fixtures/boxhash.jpg");

sdk/src/builder.rs

@@ -273,16 +273,18 @@ impl AsyncTimeStampProvider for AsyncSignerWrapper<'_> {
 #[cfg(test)]
 mod tests {
     #![allow(clippy::unwrap_used)]
-    #[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
+
     // Only used for test with file_io
     use c2pa_macros::c2pa_test_async;
+    #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
+    use wasm_bindgen_test::wasm_bindgen_test;
 
     use super::sign_claim;
-    #[cfg(feature = "file_io")]
-    use crate::utils::test_signer::async_test_signer;
     use crate::{
-        claim::Claim, crypto::raw_signature::SigningAlg, utils::test_signer::test_signer, Result,
-        Signer,
+        claim::Claim,
+        crypto::raw_signature::SigningAlg,
+        utils::test_signer::{async_test_signer, test_signer},
+        Result, Signer,
     };
 
     #[test]
@@ -307,7 +309,6 @@ mod tests {
         assert_eq!(cose_sign1.len(), box_size);
     }
 
-    #[cfg(feature = "file_io")]
     #[c2pa_test_async]
     async fn test_sign_claim_async() {
         // todo: we have to disable trust checks here for now because these

sdk/src/cose_sign.rs

@@ -209,36 +209,6 @@ impl IdentityAssertion {
         }
     }
 
-    /// Summarize all of the identity assertions found for a [`ManifestStore`].
-    ///
-    /// [`ManifestStore`]: crate::ManifestStore
-    #[cfg(feature = "v1_api")]
-    pub async fn summarize_manifest_store<SV: SignatureVerifier>(
-        store: &crate::ManifestStore,
-        status_tracker: &mut StatusTracker,
-        verifier: &SV,
-    ) -> impl Serialize {
-        // NOTE: We can't write this using .map(...).collect() because there are async
-        // calls.
-        let mut reports: BTreeMap<
-            String,
-            IdentityAssertionsForManifest<
-                <<SV as SignatureVerifier>::Output as ToCredentialSummary>::CredentialSummary,
-            >,
-        > = BTreeMap::new();
-
-        for (id, manifest) in store.manifests() {
-            let report = Self::summarize_all_impl(manifest, status_tracker, verifier).await;
-            reports.insert(id.clone(), report);
-        }
-
-        IdentityAssertionsForManifestStore::<
-            <<SV as SignatureVerifier>::Output as ToCredentialSummary>::CredentialSummary,
-        > {
-            assertions_for_manifest: reports,
-        }
-    }
-
     /// Summarize all of the identity assertions found for a [`Reader`].
     pub async fn summarize_from_reader<SV: SignatureVerifier>(
         reader: &Reader,