Removed some FIXME debugs

Author: coderdan

src/crypto/attrs/flattened_encrypted_attributes.rs

@@ -12,10 +12,7 @@ use itertools::Itertools;
 
 use super::FlattenedProtectedAttributes;
 
-// TODO: Move this elsewhere
 /// Represents a set of encrypted records that have not yet been normalized into an output type.
-// TODO: Remove the Debug derive
-#[derive(Debug)]
 pub(crate) struct FlattenedEncryptedAttributes {
     attrs: Vec<EncryptedRecord>,
 }
@@ -31,7 +28,6 @@ impl FlattenedEncryptedAttributes {
         self.attrs.is_empty()
     }
 
-    // TODO: REmove this
     pub(crate) fn len(&self) -> usize {
         self.attrs.len()
     }

src/crypto/sealed.rs

@@ -14,8 +14,6 @@ use std::{borrow::Cow, collections::HashMap};
 
 use super::{attrs::NormalizedProtectedAttributes, SealError, Unsealed};
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug)]
 // FIXME: Move this to a separate file
 /// Wrapped to indicate that the value is encrypted
 pub struct SealedTableEntry(pub(super) TableEntry);
@@ -117,7 +115,6 @@ impl SealedTableEntry {
                 .decrypt_all(cipher)
                 .await?
                 .into_iter()
-                // FIXME: chunk_size is not the same as protected_attributes.len() when dealing with maps
                 // TODO: Can we make decrypt_all return a Vec of FlattenedProtectedAttributes? (like the mirror of encrypt_all)
                 .chunks(chunk_size)
                 .into_iter()

src/crypto/sealer.rs

@@ -25,8 +25,6 @@ pub type UnsealedIndex = (
     IndexType,
 );
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug)]
 /// Builder pattern for sealing a record of type, `T`.
 pub struct Sealer {
     pub(crate) pk: String,
@@ -250,8 +248,6 @@ struct Term {
     value: Vec<u8>,
 }
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug)]
 // FIXME: This struct is almost _identical_ to the one in encrypted_table/table_entry.rs
 pub struct Sealed {
     pk: String,

src/crypto/unsealed.rs

@@ -9,8 +9,6 @@ use crate::{
 use cipherstash_client::encryption::Plaintext;
 use std::collections::HashMap;
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug)]
 /// Wrapper to indicate that a value is NOT encrypted
 pub struct Unsealed {
     /// Protected plaintexts with their descriptors

src/encrypted_table/mod.rs

@@ -109,8 +109,6 @@ pub struct DynamoRecordPatch {
     pub delete_records: Vec<PrimaryKeyParts>,
 }
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug)]
 pub struct PreparedRecord {
     protected_indexes: Cow<'static, [(Cow<'static, str>, IndexType)]>,
     protected_attributes: Cow<'static, [Cow<'static, str>]>,
@@ -383,10 +381,7 @@ impl<D> EncryptedTable<D> {
 
         let PrimaryKeyParts { pk, sk } = sealed.primary_key();
 
-        println!("PUT: PK: {}, SK: {}", pk, sk);
-
         let (root, index_entries) = sealed.into_table_entries(index_predicate);
-        println!("ROOT: {:?}", root);
 
         seen_sk.insert(root.inner().sk.clone());
         put_records.push(root.try_into()?);

src/encrypted_table/table_attribute.rs

@@ -12,7 +12,7 @@ pub trait TryFromTableAttr: Sized {
     fn try_from_table_attr(value: TableAttribute) -> Result<Self, ReadConversionError>;
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Clone, PartialEq)]
 pub enum TableAttribute {
     String(String),
     Number(String),

src/encrypted_table/table_attributes.rs

@@ -4,8 +4,7 @@ use std::{
     collections::{hash_map::IntoIter, HashMap},
 };
 
-// FIXME: Remove this (only used for debugging)
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 /// Represents a collection of attributes for a table entry.
 /// Attributes are stored as a map of `String` to `TableAttribute`.
 pub struct TableAttributes(HashMap<AttributeName, TableAttribute>);

src/encrypted_table/table_entry.rs

@@ -1,9 +1,5 @@
 use super::{table_attribute::TableAttribute, table_attributes::TableAttributes, AttributeName};
 
-// FIXME: Clean this up
-// FIXME: Can we remove the Clone and Debug?
-//#[skip_serializing_none]
-#[derive(Debug, Clone)]
 pub struct TableEntry {
     pub(crate) pk: String,
     pub(crate) sk: String,