Fix remaining aliases (#124)

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
 profile = "default"
-channel = "1.77.2"
+channel = "1.78.0"
 components = ["rust-src", "rust-analyzer", "llvm-tools"]

src/deterministic.rs

@@ -25,11 +25,8 @@ pub struct PlaintextField {
 pub struct PlaintextFields(pub HashMap<FieldId, PlaintextField>);
 custom_newtype!(PlaintextFields, HashMap<FieldId, PlaintextField>);
 
-// TODO: These newtype can't include FieldId because of a bug with generated Python
-// not using forward references. If this is addressed, we can change it.
-// See https://github.com/mozilla/uniffi-rs/issues/2067
-pub struct EncryptedFields(pub HashMap<String, EncryptedField>);
-custom_newtype!(EncryptedFields, HashMap<String, EncryptedField>);
+pub struct EncryptedFields(pub HashMap<FieldId, EncryptedField>);
+custom_newtype!(EncryptedFields, HashMap<FieldId, EncryptedField>);
 pub struct GenerateFieldQueryResult(pub HashMap<FieldId, Vec<EncryptedField>>);
 custom_newtype!(GenerateFieldQueryResult, HashMap<FieldId, Vec<EncryptedField>>);
 create_batch_result_struct!(DeterministicRotateResult, EncryptedField, FieldId);

src/saas_shield/deterministic.rs

@@ -12,11 +12,9 @@ use crate::deterministic::{
 use crate::errors::AlloyError;
 use crate::tenant_security_client::{DerivationType, SecretType, TenantSecurityClient};
 use crate::util::{check_rotation_no_op, perform_batch_action};
-use crate::FieldId;
 use crate::{alloy_client_trait::AlloyClient, AlloyMetadata, DerivationPath, SecretPath, TenantId};
 use ironcore_documents::v5::key_id_header::{EdekType, PayloadType};
 use itertools::Itertools;
-use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -197,14 +195,7 @@ impl DeterministicFieldOps for SaasShieldDeterministicClient {
                 encrypted_field.derivation_path.clone(),
             )
         };
-        Ok(perform_batch_action(
-            encrypted_fields
-                .0
-                .into_par_iter()
-                .map(|(k, v)| (FieldId(k), v)),
-            decrypt_field,
-        )
-        .into())
+        Ok(perform_batch_action(encrypted_fields.0, decrypt_field).into())
     }
 
     /// Encrypt each plaintext field with any Current and InRotation keys for the provided secret path.
@@ -321,14 +312,7 @@ impl DeterministicFieldOps for SaasShieldDeterministicClient {
                 )
             }
         };
-        Ok(perform_batch_action(
-            encrypted_fields
-                .0
-                .into_par_iter()
-                .map(|(k, v)| (FieldId(k), v)),
-            reencrypt_field,
-        )
-        .into())
+        Ok(perform_batch_action(encrypted_fields.0, reencrypt_field).into())
     }
 
     /// Generate a prefix that could used to search a data store for fields encrypted using an identifier (KMS