Don't include redundant prev_state in new events (#13791)

matrix-org · Sep 20, 2022 · c802ef1 · c802ef1
1 parent 44be423
commit c802ef1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/changelog.d/13791.removal b/changelog.d/13791.removal
@@ -0,0 +1 @@
+Don't include redundant `prev_state` in new events. Contributed by Denis Kariakin (@dakariakin).
diff --git a/synapse/events/builder.py b/synapse/events/builder.py
@@ -167,7 +167,6 @@ async def build(
             "content": self.content,
             "unsigned": self.unsigned,
             "depth": depth,
-            "prev_state": [],
         }
 
         if self.is_state():

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
@@ -906,9 +906,6 @@ async def send_request(destination: str) -> Tuple[str, EventBase, RoomVersion]:
             # The protoevent received over the JSON wire may not have all
             # the required fields. Lets just gloss over that because
             # there's some we never care about
-            if "prev_state" not in pdu_dict:
-                pdu_dict["prev_state"] = []
-
             ev = builder.create_local_event_from_event_dict(
                 self._clock,
                 self.hostname,