refactor(secure_channel): rename SecureChannel::new to SecureChannel::reciprocate and make it available outside of tests

Signed-off-by: Johannes Marbach <[email protected]>

Author: Johennes

crates/matrix-sdk/src/authentication/oauth/qrcode/login.rs

@@ -666,7 +666,7 @@ mod test {
         server.mock_query_keys().ok().expect(1).named("query_keys").mount().await;
 
         let client = HttpClient::new(reqwest::Client::new(), Default::default());
-        let alice = SecureChannel::new(client, &rendezvous_server.homeserver_url)
+        let alice = SecureChannel::reciprocate(client, &rendezvous_server.homeserver_url)
             .await
             .expect("Alice should be able to create a secure channel.");
 
@@ -1043,7 +1043,7 @@ mod test {
         server.mock_who_am_i().ok().named("whoami").mount().await;
 
         let client = HttpClient::new(reqwest::Client::new(), Default::default());
-        let alice = SecureChannel::new(client, &rendezvous_server.homeserver_url)
+        let alice = SecureChannel::reciprocate(client, &rendezvous_server.homeserver_url)
             .await
             .expect("Alice should be able to create a secure channel.");
 
@@ -1325,7 +1325,7 @@ mod test {
         server.mock_who_am_i().ok().named("whoami").mount().await;
 
         let client = HttpClient::new(reqwest::Client::new(), Default::default());
-        let alice = SecureChannel::new(client, &rendezvous_server.homeserver_url)
+        let alice = SecureChannel::reciprocate(client, &rendezvous_server.homeserver_url)
             .await
             .expect("Alice should be able to create a secure channel.");
 

crates/matrix-sdk/src/authentication/oauth/qrcode/secure_channel.rs

@@ -54,12 +54,12 @@ impl SecureChannel {
         Ok(Self { channel, qr_code_data, ecies })
     }
 
-    /// Create a new login to reciprocate an existing login with.
-    #[cfg(test)]
-    pub(super) async fn new(http_client: HttpClient, homeserver_url: &Url) -> Result<Self, Error> {
+    /// Create a new secure channel to reciprocate an existing login with.
+    pub(super) async fn reciprocate(
+        http_client: HttpClient,
+        homeserver_url: &Url,
+    ) -> Result<Self, Error> {
         let mut channel = SecureChannel::login(http_client, homeserver_url).await?;
-        // We're a bit abusing the QR code data here, since we're passing the homeserver
-        // URL, but for our tests this is fine.
         channel.qr_code_data.mode_data =
             QrCodeModeData::Reciprocate { server_name: homeserver_url.to_string() };
         Ok(channel)
@@ -354,7 +354,7 @@ pub(super) mod test {
         let rendezvous_server = MockedRendezvousServer::new(&server, "abcdEFG12345").await;
 
         let client = HttpClient::new(reqwest::Client::new(), Default::default());
-        let alice = SecureChannel::new(client, &rendezvous_server.homeserver_url)
+        let alice = SecureChannel::reciprocate(client, &rendezvous_server.homeserver_url)
             .await
             .expect("Alice should be able to create a secure channel.");