Remove unnecessary Result from private function return type

Author: jplatte

crates/matrix-sdk-crypto/src/olm/account.rs

@@ -862,7 +862,7 @@ impl ReadOnlyAccount {
 
     pub(crate) async fn signed_one_time_keys_helper(
         &self,
-    ) -> Result<BTreeMap<Box<DeviceKeyId>, Raw<OneTimeKey>>, ()> {
+    ) -> BTreeMap<Box<DeviceKeyId>, Raw<OneTimeKey>> {
         let one_time_keys = self.one_time_keys().await;
         let mut one_time_key_map = BTreeMap::new();
 
@@ -897,7 +897,7 @@ impl ReadOnlyAccount {
             );
         }
 
-        Ok(one_time_key_map)
+        one_time_key_map
     }
 
     /// Generate, sign and prepare one-time keys to be uploaded.
@@ -907,7 +907,7 @@ impl ReadOnlyAccount {
         &self,
     ) -> Result<BTreeMap<Box<DeviceKeyId>, Raw<OneTimeKey>>, ()> {
         let _ = self.generate_one_time_keys().await?;
-        self.signed_one_time_keys_helper().await
+        Ok(self.signed_one_time_keys_helper().await)
     }
 
     /// Create a new session with another account given a one-time key.

crates/matrix-sdk-crypto/src/session_manager/sessions.rs

@@ -412,7 +412,7 @@ mod test {
         assert!(request.one_time_keys.contains_key(bob.user_id()));
 
         bob.generate_one_time_keys_helper(1).await;
-        let one_time = bob.signed_one_time_keys_helper().await.unwrap();
+        let one_time = bob.signed_one_time_keys_helper().await;
         bob.mark_keys_as_published().await;
 
         let mut one_time_keys = BTreeMap::new();
@@ -462,7 +462,7 @@ mod test {
         assert!(request.one_time_keys.contains_key(bob.user_id()));
 
         bob.generate_one_time_keys_helper(1).await;
-        let one_time = bob.signed_one_time_keys_helper().await.unwrap();
+        let one_time = bob.signed_one_time_keys_helper().await;
         bob.mark_keys_as_published().await;
 
         let mut one_time_keys = BTreeMap::new();