diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-03 15:32:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-03 15:32:17 +0000 |
| commit | 9bace3a36751deed141225ccabd5bebecebc25f3 (patch) | |
| tree | f45c534eabde779d43109e688fa8c9afd20d01c3 /synapse/federation/federation_base.py | |
| parent | Remove unused imports (diff) | |
| download | synapse-9bace3a36751deed141225ccabd5bebecebc25f3.tar.xz | |
Actually, the old prune_event function was non-deterministic, so no point keeping it around :(
Diffstat (limited to '')
| -rw-r--r-- | synapse/federation/federation_base.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index d26a2396ac..27c5918e0f 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -16,7 +16,7 @@ from twisted.internet import defer -from synapse.events.utils import prune_event, old_prune_event +from synapse.events.utils import prune_event from syutil.jsonutil import encode_canonical_json @@ -96,18 +96,10 @@ class FederationBase(object): redacted_event = prune_event(pdu) redacted_pdu_json = redacted_event.get_pdu_json() - old_redacted = old_prune_event(pdu) - old_redacted_pdu_json = old_redacted.get_pdu_json() - try: - try: - yield self.keyring.verify_json_for_server( - pdu.origin, old_redacted_pdu_json - ) - except SynapseError: - yield self.keyring.verify_json_for_server( - pdu.origin, redacted_pdu_json - ) + yield self.keyring.verify_json_for_server( + pdu.origin, redacted_pdu_json + ) except SynapseError: logger.warn( "Signature check failed for %s redacted to %s", |