diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-02 10:33:49 +0100 |
| commit | d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a (patch) | |
| tree | 4458974456c631386c7acd699b15a9f51779f0b2 /synapse/state.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable (diff) | |
| parent | Merge pull request #283 from matrix-org/erikj/atomic_join_federation (diff) | |
| download | synapse-d5e081c7ae4c1669d7f1b1280a893bc80c0ae72a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/state.py b/synapse/state.py index 1fe4d066bd..bb225c39cf 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -17,7 +17,6 @@ from twisted.internet import defer from synapse.util.logutils import log_function -from synapse.util.async import run_on_reactor from synapse.util.caches.expiringcache import ExpiringCache from synapse.api.constants import EventTypes from synapse.api.errors import AuthError @@ -32,10 +31,6 @@ import hashlib logger = logging.getLogger(__name__) -def _get_state_key_from_event(event): - return event.state_key - - KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key")) @@ -119,8 +114,6 @@ class StateHandler(object): Returns: an EventContext """ - yield run_on_reactor() - context = EventContext() if outlier: |