diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-14 19:10:52 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-14 19:11:04 +0000 |
| commit | 8c2b5ea7c44e3915068cd9ec18e5c22d0a3acfcc (patch) | |
| tree | cc9d5c93ab2bc044e7e3cd51b43025c68a00da76 /synapse/storage | |
| parent | Validate signatures on incoming events (diff) | |
| download | synapse-8c2b5ea7c44e3915068cd9ec18e5c22d0a3acfcc.tar.xz | |
Fix PDU and event signatures
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/__init__.py | 4 | ||||
| -rw-r--r-- | synapse/storage/feedback.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index d8f351a675..c36d938d96 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -132,8 +132,8 @@ class DataStore(RoomMemberStore, RoomStore, if not events_dict: defer.returnValue(None) - event = self._parse_event_from_row(events_dict) - defer.returnValue(event) + event = yield self._parse_events([events_dict]) + defer.returnValue(event[0]) @log_function def _persist_event_txn(self, txn, event, backfilled, stream_ordering=None, diff --git a/synapse/storage/feedback.py b/synapse/storage/feedback.py index 8a18617188..21511577c5 100644 --- a/synapse/storage/feedback.py +++ b/synapse/storage/feedback.py @@ -41,7 +41,7 @@ class FeedbackStore(SQLBaseStore): defer.returnValue( [ - self._parse_event_from_row(r) + (yield self._parse_events(r)) for r in rows ] ) |