diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-11 14:19:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-11 14:19:13 +0000 |
| commit | 092979b8cca4c602c54e1b39ee15c8ce030e949d (patch) | |
| tree | 955e95fa96aec11ca3f776a977f1f6438f7fd111 /synapse | |
| parent | Fix state tests (diff) | |
| download | synapse-092979b8cca4c602c54e1b39ee15c8ce030e949d.tar.xz | |
Fix bugs which broke federation due to changes in function signatures.
Diffstat (limited to '')
| -rw-r--r-- | synapse/federation/replication.py | 4 | ||||
| -rw-r--r-- | synapse/state.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py index bacba36755..5c625ddabf 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py @@ -510,7 +510,7 @@ class ReplicationLayer(object): @log_function def _handle_new_pdu(self, origin, pdu, backfilled=False): # We reprocess pdus when we have seen them only as outliers - existing = yield self._get_persisted_pdu(pdu.event_id) + existing = yield self._get_persisted_pdu(origin, pdu.event_id) if existing and (not existing.outlier or pdu.outlier): logger.debug("Already seen pdu %s", pdu.event_id) @@ -528,7 +528,7 @@ class ReplicationLayer(object): if min_depth and pdu.depth > min_depth: for event_id, hashes in pdu.prev_events: - exists = yield self._get_persisted_pdu(event_id) + exists = yield self._get_persisted_pdu(origin, event_id) if not exists: logger.debug("Requesting pdu %s", event_id) diff --git a/synapse/state.py b/synapse/state.py index a58acb3c1e..11c54fd38c 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -105,7 +105,7 @@ class StateHandler(object): defer.returnValue(res[1].get((event_type, state_key))) return - defer.returnValue(res.values()) + defer.returnValue(res[1].values()) @defer.inlineCallbacks @log_function |