diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-07-30 23:33:06 -0400 |
| commit | c1f0a5636c9df647209794661627668547ce929a (patch) | |
| tree | 464db1ef298b1f110c5ea1003ef1ed019000ab41 /synapse/events/builder.py | |
| parent | add changelog file (diff) | |
| parent | Merge pull request #5793 from matrix-org/erikj/fix_bg_update (diff) | |
| download | synapse-c1f0a5636c9df647209794661627668547ce929a.tar.xz | |
Merge branch 'develop' into cross-signing_hidden
Diffstat (limited to 'synapse/events/builder.py')
| -rw-r--r-- | synapse/events/builder.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py index db011e0407..3997751337 100644 --- a/synapse/events/builder.py +++ b/synapse/events/builder.py @@ -144,15 +144,13 @@ class EventBuilder(object): if self._origin_server_ts is not None: event_dict["origin_server_ts"] = self._origin_server_ts - defer.returnValue( - create_local_event_from_event_dict( - clock=self._clock, - hostname=self._hostname, - signing_key=self._signing_key, - format_version=self.format_version, - event_dict=event_dict, - internal_metadata_dict=self.internal_metadata.get_dict(), - ) + return create_local_event_from_event_dict( + clock=self._clock, + hostname=self._hostname, + signing_key=self._signing_key, + format_version=self.format_version, + event_dict=event_dict, + internal_metadata_dict=self.internal_metadata.get_dict(), ) |