feat: Make settings not thread-local

sdk/src/assertions/bmff_hash.rs

@@ -35,7 +35,7 @@ use crate::{
     },
     asset_io::CAIRead,
     cbor_types::UriT,
-    settings::get_settings_value,
+    settings::Settings,
     utils::{
         hash_utils::{
             concat_and_hash, hash_stream_by_alg, vec_compare, verify_stream_by_alg, HashRange,
@@ -1037,15 +1037,14 @@ impl BmffHash {
     #[cfg(feature = "file_io")]
     pub fn add_merkle_for_fragmented(
         &mut self,
+        max_proofs: usize,
         alg: &str,
         asset_path: &std::path::Path,
         fragment_paths: &Vec<std::path::PathBuf>,
         output_dir: &std::path::Path,
         local_id: usize,
         unique_id: Option<usize>,
     ) -> crate::Result<()> {
-        let max_proofs = get_settings_value::<usize>("core.merkle_tree_max_proofs")?;
-
         if !output_dir.exists() {
             std::fs::create_dir_all(output_dir)?;
         } else {
@@ -1342,8 +1341,9 @@ impl BmffHash {
         reader: &mut dyn CAIRead,
         box_info: &BoxInfoLite,
         merkle_map: &mut MerkleMap,
+        settings: &Settings,
     ) -> crate::Result<Vec<Vec<u8>>> {
-        let max_proofs = get_settings_value::<usize>("core.merkle_tree_max_proofs")?;
+        let max_proofs = settings.core.merkle_tree_max_proofs;
 
         // build the Merkle tree
         let m_tree = self.create_merkle_tree_for_merkle_map(reader, box_info, merkle_map)?;

sdk/src/asset_handlers/bmff_io.rs

@@ -1684,6 +1684,7 @@ impl CAIWriter for BmffIO {
         // if the incoming Store has an update manifest we must split it into original and update stores
         let mut validation_log =
             StatusTracker::with_error_behavior(ErrorBehavior::StopOnFirstError);
+
         let (pc, is_update) = if let Ok(store) = Store::from_jumbf(store_bytes, &mut validation_log)
         {
             let pc = store
@@ -1726,7 +1727,7 @@ impl CAIWriter for BmffIO {
             let pc = pc.ok_or(Error::BadParam("no provenance manifest".to_string()))?;
 
             let mut update_store = Store::from_jumbf(update_manifest_bytes, &mut validation_log)?;
-            // add new update manfiest or replace existing one if the is a finalization pass
+            // add new update manfiest or replace existing one if the is a 8finalization pass
             update_store.replace_claim_or_insert(pc.label().to_string(), pc);
 
             let new_update_bytes = update_store.to_jumbf_internal(0)?;

sdk/src/asset_handlers/c2pa_io.rs

@@ -149,6 +149,7 @@ pub mod tests {
     use super::{AssetIO, C2paIO, CAIReader, CAIWriter};
     use crate::{
         crypto::raw_signature::SigningAlg,
+        settings::Settings,
         status_tracker::{ErrorBehavior, StatusTracker},
         store::Store,
         utils::{
@@ -160,6 +161,8 @@ pub mod tests {
 
     #[test]
     fn c2pa_io_parse() {
+        let settings = Settings::default();
+
         let path = fixture_path("C.jpg");
 
         let temp_dir = tempdirectory().expect("temp dir");
@@ -183,6 +186,7 @@ pub mod tests {
             &stream,
             true,
             &mut StatusTracker::with_error_behavior(ErrorBehavior::StopOnFirstError),
+            &settings,
         )
         .expect("loading store");