fix: remove serialize_thumbnails feature (#1492)

* fix: remove `serialize_thumbnails` feature

* fix: skip serializing resource store

Author: ok-nick

docs/usage.md

@@ -40,7 +40,6 @@ The Rust library crate provides the following capabilities:
 * `fetch_remote_manifests` enables the verification step to retrieve externally referenced manifest stores.  External manifests are only fetched if there is no embedded manifest store and no locally adjacent .c2pa manifest store file of the same name.
 * `file_io` enables manifest generation, signing via OpenSSL, and embedding manifests in [supported file formats](supported-formats.md).
 * `json_schema` is used by `make schema` to produce a JSON schema document that represents the `ManifestStore` data structures.
-* `serialize_thumbnails` includes binary thumbnail data in the [Serde](https://serde.rs/) serialization output.
 * `pdf` - Enable support for reading claims on PDF files.
 
 * the `v1_api` feature is no longer supported.

sdk/Cargo.toml

@@ -31,7 +31,6 @@ rustdoc-args = ["--cfg", "docsrs"]
 default = ["openssl"]
 add_thumbnails = ["image"]
 file_io = []
-serialize_thumbnails = []
 fetch_remote_manifests = ["dep:wasi"]
 json_schema = ["dep:schemars"]
 openssl = ["dep:openssl"]

sdk/src/ingredient.rs

@@ -40,7 +40,7 @@ use crate::{
         labels::{assertion_label_from_uri, manifest_label_from_uri},
     },
     log_item,
-    resource_store::{skip_serializing_resources, ResourceRef, ResourceStore},
+    resource_store::{ResourceRef, ResourceStore},
     salt::DefaultSalt,
     settings::Settings,
     status_tracker::StatusTracker,
@@ -145,8 +145,7 @@ pub struct Ingredient {
     #[serde(skip_serializing_if = "Option::is_none")]
     label: Option<String>,
 
-    #[serde(skip_deserializing)]
-    #[serde(skip_serializing_if = "skip_serializing_resources")]
+    #[serde(skip)]
     resources: ResourceStore,
 
     #[serde(skip_serializing_if = "Option::is_none")]

sdk/src/manifest.rs

@@ -34,7 +34,7 @@ use crate::{
     ingredient::Ingredient,
     jumbf::labels::{to_absolute_uri, to_assertion_uri},
     manifest_assertion::ManifestAssertion,
-    resource_store::{mime_from_uri, skip_serializing_resources, ResourceRef, ResourceStore},
+    resource_store::{mime_from_uri, ResourceRef, ResourceStore},
     settings::Settings,
     status_tracker::StatusTracker,
     store::Store,
@@ -122,8 +122,7 @@ pub struct Manifest {
     remote_manifest: Option<RemoteManifest>,
 
     /// container for binary assets (like thumbnails)
-    #[serde(skip_deserializing)]
-    #[serde(skip_serializing_if = "skip_serializing_resources")]
+    #[serde(skip)]
     resources: ResourceStore,
 }
 

sdk/src/resource_store.rs

@@ -40,16 +40,6 @@ use crate::{
     Error, Result,
 };
 
-/// Function that is used by serde to determine whether or not we should serialize
-/// resources based on the `serialize_resources` flag.
-/// (Serialization is disabled by default.)
-pub(crate) fn skip_serializing_resources(_: &ResourceStore) -> bool {
-    //TODO: Why is this disabled for wasm32?
-    !cfg!(feature = "serialize_thumbnails")
-        || cfg!(test)
-        || cfg!(not(all(target_arch = "wasm32", not(target_os = "wasi"))))
-}
-
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "json_schema", derive(JsonSchema))]
 #[serde(untagged)]