Refactoring the sealer a bit, not sure if its better

Author: coderdan

src/crypto/sealer.rs

@@ -103,15 +103,16 @@ impl<T> Sealer<T> {
                                 term_length,
                             )
                             .map_err(SealError::CryptoError)
-                            .and_then(|index_term| match index_term {
-                                IndexTerm::Binary(x) => Ok(vec![(index_name, x)]),
-                                IndexTerm::BinaryVec(x) => {
-                                    Ok(x.into_iter().map(|x| (index_name, x)).collect())
-                                }
-                                _ => Err(SealError::InvalidCiphertext("Invalid index term".into())),
-                            })
+                            .map(|result| (index_name, result))
                     })
             })
+            .map(|index_term| match index_term {
+                Ok((index_name, IndexTerm::Binary(x))) => Ok(vec![(index_name, x)]),
+                Ok((index_name, IndexTerm::BinaryVec(x))) => {
+                    Ok(x.into_iter().map(|x| (index_name, x)).collect())
+                }
+                _ => Err(SealError::InvalidCiphertext("Invalid index term".into())),
+            })
             .flatten_ok()
             .try_collect()?;
 

src/traits/mod.rs

@@ -54,12 +54,6 @@ pub trait Searchable: Encryptable {
     }
 }
 
-/*
-We need to identify which fields from TableAttributes are encrypted and which are plaintext.
-Decrypt the ciphertexts and convert them all into the final record.
-Conversion would take the that were decrypted and a subset of the TableAttributes.
-*/
-
 pub trait Decryptable: Encryptable {
     /// Convert an `Unsealed` into a `Self`.
     fn from_unsealed(unsealed: Unsealed) -> Result<Self, SealError>;