diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-23 11:45:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 11:45:39 +0100 |
| commit | 2e052110ee0bca17b8e27b6b48ee8b7c64bc94ae (patch) | |
| tree | 0fd57d67b7d8908a97e7e54d049ad7656090c837 /tests/crypto/test_keyring.py | |
| parent | Simplifications and comments in do_auth (#5227) (diff) | |
| download | synapse-2e052110ee0bca17b8e27b6b48ee8b7c64bc94ae.tar.xz | |
Rewrite store_server_verify_key to store several keys at once (#5234)
Storing server keys hammered the database a bit. This replaces the implementation which stored a single key, with one which can do many updates at once.
Diffstat (limited to 'tests/crypto/test_keyring.py')
| -rw-r--r-- | tests/crypto/test_keyring.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/crypto/test_keyring.py b/tests/crypto/test_keyring.py index 3c79d4afe7..bcffe53a91 100644 --- a/tests/crypto/test_keyring.py +++ b/tests/crypto/test_keyring.py @@ -192,8 +192,18 @@ class KeyringTestCase(unittest.HomeserverTestCase): kr = keyring.Keyring(self.hs) key1 = signedjson.key.generate_signing_key(1) - r = self.hs.datastore.store_server_verify_key( - "server9", "", time.time() * 1000, signedjson.key.get_verify_key(key1) + key1_id = "%s:%s" % (key1.alg, key1.version) + + r = self.hs.datastore.store_server_verify_keys( + "server9", + time.time() * 1000, + [ + ( + "server9", + key1_id, + signedjson.key.get_verify_key(key1), + ), + ], ) self.get_success(r) json1 = {} |