From f447c55fcbcccf7a4e144e948206b27581c8e767 Mon Sep 17 00:00:00 2001
From: Denis Kasak <dkasak@termina.org.uk>
Date: Tue, 30 Jun 2020 19:02:42 +0200
Subject: [PATCH] Move prev_content in test data to top level for now.

Until Ruma fixes it upstream, see hoist_room_event_prev_content for more
information.
---
 matrix_sdk_test/src/test_json/events.rs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/matrix_sdk_test/src/test_json/events.rs b/matrix_sdk_test/src/test_json/events.rs
index a4ba0ced..c3bcea49 100644
--- a/matrix_sdk_test/src/test_json/events.rs
+++ b/matrix_sdk_test/src/test_json/events.rs
@@ -208,6 +208,7 @@ lazy_static! {
     });
 }
 
+// TODO: Move `prev_content` into `unsigned` once ruma supports it
 lazy_static! {
     pub static ref MEMBER: JsonValue = json!({
         "content": {
@@ -221,14 +222,14 @@ lazy_static! {
         "sender": "@example:localhost",
         "state_key": "@example:localhost",
         "type": "m.room.member",
+        "prev_content": {
+            "avatar_url": null,
+            "displayname": "example",
+            "membership": "invite"
+        },
         "unsigned": {
             "age": 297036,
-            "replaces_state": "$151800111315tsynI:localhost",
-            "prev_content": {
-                "avatar_url": null,
-                "displayname": "example",
-                "membership": "invite"
-            }
+            "replaces_state": "$151800111315tsynI:localhost"
         }
     });
 }
@@ -552,6 +553,7 @@ lazy_static! {
     });
 }
 
+// TODO: Move `prev_content` into `unsigned` once ruma supports it
 lazy_static! {
     pub static ref TOPIC: JsonValue = json!({
         "content": {
@@ -562,11 +564,11 @@ lazy_static! {
         "sender": "@example:localhost",
         "state_key": "",
         "type": "m.room.topic",
+        "prev_content": {
+            "topic": "test"
+        },
         "unsigned": {
           "age": 1392989,
-          "prev_content": {
-            "topic": "test"
-          },
           "prev_sender": "@example:localhost",
           "replaces_state": "$151957069225EVYKm:localhost"
         }