diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 16:47:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 16:47:48 +0100 |
| commit | 0e938b1ff75bdeffefb3f3a3260972a19d99d4d9 (patch) | |
| tree | 9d1e3eed368dd954e311e096ea8d9fd4c2bc4e8a /synapse | |
| parent | Fix typo of key name (diff) | |
| download | synapse-0e938b1ff75bdeffefb3f3a3260972a19d99d4d9.tar.xz | |
Rename method name to not clash with other ones in storage.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/state.py | 2 | ||||
| -rw-r--r-- | synapse/storage/pdu.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/state.py b/synapse/state.py index 4f8b4d9760..ca8e1ca630 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -86,7 +86,7 @@ class StateHandler(object): else: event.depth = 0 - current_state = yield self.store.get_current_state( + current_state = yield self.store.get_current_state_pdu( key.context, key.type, key.state_key ) diff --git a/synapse/storage/pdu.py b/synapse/storage/pdu.py index 13adc581e1..a24ce7ab78 100644 --- a/synapse/storage/pdu.py +++ b/synapse/storage/pdu.py @@ -580,7 +580,7 @@ class StatePduStore(SQLBaseStore): txn.execute(query, query_args) - def get_current_state(self, context, pdu_type, state_key): + def get_current_state_pdu(self, context, pdu_type, state_key): """For a given context, pdu_type, state_key 3-tuple, return what is currently considered the current state. @@ -595,10 +595,10 @@ class StatePduStore(SQLBaseStore): """ return self._db_pool.runInteraction( - self._get_current_state, context, pdu_type, state_key + self._get_current_state_pdu, context, pdu_type, state_key ) - def _get_current_state(self, txn, context, pdu_type, state_key): + def _get_current_state_pdu(self, txn, context, pdu_type, state_key): return self._get_current_interaction(txn, context, pdu_type, state_key) def _get_current_interaction(self, txn, context, pdu_type, state_key): |