diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-07-14 13:08:33 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-07-20 18:23:54 +0100 |
| commit | 3b5823c74d5bffc68068284145cc78a33476ac84 (patch) | |
| tree | cfbeb46ca3e0a6085559e9670658cf9f98bce750 /synapse/storage | |
| parent | Merge pull request #204 from illicitonion/develop (diff) | |
| download | synapse-3b5823c74d5bffc68068284145cc78a33476ac84.tar.xz | |
s/take/claim/ for end to end key APIs
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index 99dc864e46..325740d7d0 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -95,9 +95,9 @@ class EndToEndKeyStore(SQLBaseStore): "count_e2e_one_time_keys", _count_e2e_one_time_keys ) - def take_e2e_one_time_keys(self, query_list): + def claim_e2e_one_time_keys(self, query_list): """Take a list of one time keys out of the database""" - def _take_e2e_one_time_keys(txn): + def _claim_e2e_one_time_keys(txn): sql = ( "SELECT key_id, key_json FROM e2e_one_time_keys_json" " WHERE user_id = ? AND device_id = ? AND algorithm = ?" @@ -121,5 +121,5 @@ class EndToEndKeyStore(SQLBaseStore): txn.execute(sql, (user_id, device_id, algorithm, key_id)) return result return self.runInteraction( - "take_e2e_one_time_keys", _take_e2e_one_time_keys + "claim_e2e_one_time_keys", _claim_e2e_one_time_keys ) |