Rename method name to not clash with other ones in storage.

pull/4/merge
Erik Johnston 10 years ago
parent 6efc688917
commit 0e938b1ff7
  1. 2
      synapse/state.py
  2. 6
      synapse/storage/pdu.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
)

@ -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):

Loading…
Cancel
Save