From f619bbb884ff649662e7f32777acf79eacdb4b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Tue, 25 May 2021 14:20:13 +0200
Subject: [PATCH] base: Change receipt store tests' user ID

---
 matrix_sdk_base/src/store/memory_store.rs   | 15 +++++++++------
 matrix_sdk_base/src/store/sled_store/mod.rs | 11 +++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/matrix_sdk_base/src/store/memory_store.rs b/matrix_sdk_base/src/store/memory_store.rs
index edee0ba3..7306dfcb 100644
--- a/matrix_sdk_base/src/store/memory_store.rs
+++ b/matrix_sdk_base/src/store/memory_store.rs
@@ -515,12 +515,15 @@ mod test {
 
     use super::{MemoryStore, StateChanges};
 
+    fn user_id() -> UserId {
+        user_id!("@example:localhost")
+    }
+
     #[async_test]
     async fn test_receipts_saving() {
         let store = MemoryStore::new();
 
         let room_id = room_id!("!test:localhost");
-        let user_id = user_id!("@rikj:jki.re");
 
         let first_event_id = event_id!("$1435641916114394fHBLK:matrix.org");
         let second_event_id = event_id!("$fHBLK1435641916114394:matrix.org");
@@ -528,7 +531,7 @@ mod test {
         let first_receipt_event = serde_json::from_value(json!({
             first_event_id.clone(): {
                 "m.read": {
-                    user_id.clone(): {
+                    user_id(): {
                         "ts": 1436451550453u64
                     }
                 }
@@ -539,7 +542,7 @@ mod test {
         let second_receipt_event = serde_json::from_value(json!({
             second_event_id.clone(): {
                 "m.read": {
-                    user_id.clone(): {
+                    user_id(): {
                         "ts": 1436451551453u64
                     }
                 }
@@ -548,7 +551,7 @@ mod test {
         .unwrap();
 
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_none());
@@ -568,7 +571,7 @@ mod test {
 
         store.save_changes(&changes).await.unwrap();
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_some(),);
@@ -591,7 +594,7 @@ mod test {
 
         store.save_changes(&changes).await.unwrap();
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_some());
diff --git a/matrix_sdk_base/src/store/sled_store/mod.rs b/matrix_sdk_base/src/store/sled_store/mod.rs
index a32b2105..bcf46007 100644
--- a/matrix_sdk_base/src/store/sled_store/mod.rs
+++ b/matrix_sdk_base/src/store/sled_store/mod.rs
@@ -936,7 +936,6 @@ mod test {
         let store = SledStore::open().unwrap();
 
         let room_id = room_id!("!test:localhost");
-        let user_id = user_id!("@rikj:jki.re");
 
         let first_event_id = event_id!("$1435641916114394fHBLK:matrix.org");
         let second_event_id = event_id!("$fHBLK1435641916114394:matrix.org");
@@ -944,7 +943,7 @@ mod test {
         let first_receipt_event = serde_json::from_value(json!({
             first_event_id.clone(): {
                 "m.read": {
-                    user_id.clone(): {
+                    user_id(): {
                         "ts": 1436451550453u64
                     }
                 }
@@ -955,7 +954,7 @@ mod test {
         let second_receipt_event = serde_json::from_value(json!({
             second_event_id.clone(): {
                 "m.read": {
-                    user_id.clone(): {
+                    user_id(): {
                         "ts": 1436451551453u64
                     }
                 }
@@ -964,7 +963,7 @@ mod test {
         .unwrap();
 
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_none());
@@ -984,7 +983,7 @@ mod test {
 
         store.save_changes(&changes).await.unwrap();
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_some(),);
@@ -1007,7 +1006,7 @@ mod test {
 
         store.save_changes(&changes).await.unwrap();
         assert!(store
-            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id)
+            .get_user_room_receipt_event(&room_id, ReceiptType::Read, &user_id())
             .await
             .unwrap()
             .is_some());