diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-06 15:16:26 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-06 15:16:26 +0000 |
| commit | cc0532a4bf328478d508242d830433a33c4f22b2 (patch) | |
| tree | aa4e32a8e2ee9130e540f01353a7e311f2c79014 /synapse/handlers | |
| parent | Move delta/v13.sql to delta/v12.sql (diff) | |
| download | synapse-cc0532a4bf328478d508242d830433a33c4f22b2.tar.xz | |
Explicitly list the RejectedReasons that we can prove
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index b13b7c7701..0f9c82fd06 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -860,9 +860,14 @@ class FederationHandler(BaseHandler): # Only do auth resolution if we have something new to say. # We can't rove an auth failure. do_resolution = False + + provable = [ + RejectedReason.NOT_ANCESTOR, RejectedReason.NOT_ANCESTOR, + ] + for e_id in different_auth: if e_id in have_events: - if have_events[e_id] != RejectedReason.AUTH_ERROR: + if have_events[e_id] in provable: do_resolution = True break |