Simplify error check in SqliteStore note getters

lambdaclass · Apr 19, 2024 · ee831a0 · ee831a0
1 parent 563bf03
commit ee831a0
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/store/sqlite_store/notes.rs b/src/store/sqlite_store/notes.rs
@@ -113,21 +113,20 @@ impl SqliteStore {
         if let NoteFilter::Unique(note_id) = filter {
             params.push(note_id.inner().to_string());
         }
-        let query_result = self
+        let notes = self
             .db
             .prepare(&filter.to_query(NoteTable::InputNotes))?
             .query_map(params_from_iter(params), parse_input_note_columns)
             .expect("no binding parameters used in query")
             .map(|result| Ok(result?).and_then(parse_input_note))
-            .collect::<Result<Vec<InputNoteRecord>, _>>();
-        if let Ok(ref notes) = query_result {
-            if let NoteFilter::Unique(note_id) = filter {
-                if notes.is_empty() {
-                    return Err(StoreError::NoteNotFound(note_id));
-                }
+            .collect::<Result<Vec<InputNoteRecord>, _>>()?;
+
+        if let NoteFilter::Unique(note_id) = filter {
+            if notes.is_empty() {
+                return Err(StoreError::NoteNotFound(note_id));
             }
         }
-        query_result
+        Ok(notes)
     }
 
     /// Retrieves the output notes from the database
@@ -139,21 +138,20 @@ impl SqliteStore {
         if let NoteFilter::Unique(note_id) = filter {
             params.push(note_id.inner().to_string());
         }
-        let query_result = self
+        let notes = self
             .db
             .prepare(&filter.to_query(NoteTable::OutputNotes))?
             .query_map(params_from_iter(params), parse_output_note_columns)
             .expect("no binding parameters used in query")
             .map(|result| Ok(result?).and_then(parse_output_note))
-            .collect::<Result<Vec<OutputNoteRecord>, _>>();
-        if let Ok(ref notes) = query_result {
-            if let NoteFilter::Unique(note_id) = filter {
-                if notes.is_empty() {
-                    return Err(StoreError::NoteNotFound(note_id));
-                }
+            .collect::<Result<Vec<OutputNoteRecord>, _>>()?;
+
+        if let NoteFilter::Unique(note_id) = filter {
+            if notes.is_empty() {
+                return Err(StoreError::NoteNotFound(note_id));
             }
         }
-        query_result
+        Ok(notes)
     }
 
     pub(crate) fn insert_input_note(&mut self, note: &InputNoteRecord) -> Result<(), StoreError> {