Remove unnecessary Result

src/database/uiaa.rs

@@ -166,13 +166,12 @@ impl Uiaa {
         user_id: &UserId,
         device_id: &DeviceId,
         session: &str,
-    ) -> Result<Option<CanonicalJsonValue>> {
+    ) -> Option<CanonicalJsonValue> {
-        Ok(self
+        self.userdevicesessionid_uiaarequest
-            .userdevicesessionid_uiaarequest
             .read()
             .unwrap()
             .get(&(user_id.to_owned(), device_id.to_owned(), session.to_owned()))
-            .map(|j| j.to_owned()))
+            .map(|j| j.to_owned())
     }
 
     fn update_uiaa_session(

src/ruma_wrapper.rs

@@ -296,14 +296,11 @@ where
                 .and_then(|auth| auth.get("session"))
                 .and_then(|session| session.as_str())
                 .and_then(|session| {
-                    db.uiaa
+                    db.uiaa.get_uiaa_request(
-                        .get_uiaa_request(
+                        &user_id,
-                            &user_id,
+                        &sender_device.clone().unwrap_or_else(|| "".into()),
-                            &sender_device.clone().unwrap_or_else(|| "".into()),
+                        session,
-                            session,
+                    )
-                        )
-                        .ok()
-                        .flatten()
                 })
             {
                 for (key, value) in initial_request {