diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-06 13:05:22 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-06 13:05:22 +0100 |
| commit | 4f8baab0c47432401036e639e12d65257bd6bb3d (patch) | |
| tree | 1570528894d933a533b2a3fda13b65fc32ac218f /synapse/federation/persistence.py | |
| parent | Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter (diff) | |
| parent | Merge tag 'v0.33.3.1' (diff) | |
| download | synapse-4f8baab0c47432401036e639e12d65257bd6bb3d.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/federation/persistence.py')
| -rw-r--r-- | synapse/federation/persistence.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py index 9146215c21..74ffd13b4f 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py @@ -36,7 +36,7 @@ class TransactionActions(object): self.store = datastore @log_function - def have_responded(self, transaction): + def have_responded(self, origin, transaction): """ Have we already responded to a transaction with the same id and origin? @@ -50,11 +50,11 @@ class TransactionActions(object): "transaction_id") return self.store.get_received_txn_response( - transaction.transaction_id, transaction.origin + transaction.transaction_id, origin ) @log_function - def set_response(self, transaction, code, response): + def set_response(self, origin, transaction, code, response): """ Persist how we responded to a transaction. Returns: @@ -66,7 +66,7 @@ class TransactionActions(object): return self.store.set_received_txn_response( transaction.transaction_id, - transaction.origin, + origin, code, response, ) |