feat: fixup

Author: kaylendog

crates/matrix-sdk/src/room/futures.rs

@@ -407,9 +407,12 @@ impl<'a> SendStateEventRaw<'a> {
     }
 
     /// Returns `true` if the inner event should be encrypted.
+    #[cfg(feature = "e2e-encryption")]
     fn should_encrypt(room: &Room, event_type: &str) -> bool {
+        use tracing::debug;
+
         if !room.encryption_state().is_state_encrypted() {
-            trace!("Sending plaintext event as the room does NOT support encrypted state events.");
+            debug!("Sending plaintext event as the room does NOT support encrypted state events.");
             return false;
         }
 
@@ -427,6 +430,7 @@ impl<'a> SendStateEventRaw<'a> {
                 | "m.space.child"
                 | "m.space.parent"
         ) {
+            debug!("Sending plaintext event as its type is excluded from encryption.");
             return false;
         }
 
@@ -448,8 +452,10 @@ impl<'a> IntoFuture for SendStateEventRaw<'a> {
 
             #[cfg(feature = "e2e-encryption")]
             if Self::should_encrypt(room, event_type) {
+                use tracing::debug;
+
                 Span::current().record("is_room_encrypted", true);
-                trace!(
+                debug!(
                     room_id = ?room.room_id(),
                     "Sending encrypted event because the room is encrypted.",
                 );

testing/matrix-sdk-integration-testing/src/tests/e2ee/state_events.rs

@@ -1,4 +1,4 @@
-use std::ops::Deref;
+use std::{ops::Deref, time::Duration};
 
 use anyhow::Result;
 use assert_matches2::assert_let;
@@ -29,6 +29,7 @@ async fn test_e2ee_state_events() -> Result<()> {
 
     let alice = TestClientBuilder::new("alice")
         .use_sqlite()
+        .http_proxy("http://localhost:8080/".to_owned())
         .encryption_settings(encryption_settings)
         .enable_share_history_on_invite(true)
         .build()
@@ -52,7 +53,7 @@ async fn test_e2ee_state_events() -> Result<()> {
             .await?,
     );
 
-    // Alice creates a room ...
+    // Alice creates an encrypted room ...
     let alice_room = alice
         .create_room(assign!(CreateRoomRequest::new(), {
             name: Some("Cat Photos".to_owned()),
@@ -61,6 +62,16 @@ async fn test_e2ee_state_events() -> Result<()> {
         .await?;
     alice_room.enable_encryption_with_state().await?;
 
+    // HACK: wait for sync
+    let _ = tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // (sanity checks)
+    assert!(alice_room.encryption_state().is_encrypted(), "Encryption was not enabled.");
+    assert!(
+        alice_room.encryption_state().is_state_encrypted(),
+        "State encryption was not enabled."
+    );
+
     info!(room_id = ?alice_room.room_id(), "Alice has created and enabled encryption in the room");
 
     // ... and changes the room name