mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 14:20:23 +00:00
Replace SlavedKeyStore with a shim
since we're pulling everything out of KeyStore anyway, we may as well simplify it.
This commit is contained in:
parent
f88a9e6323
commit
f50efcb65d
1 changed files with 4 additions and 14 deletions
|
@ -13,19 +13,9 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from synapse.storage import DataStore
|
from synapse.storage import KeyStore
|
||||||
from synapse.storage.keys import KeyStore
|
|
||||||
|
|
||||||
from ._base import BaseSlavedStore, __func__
|
# KeyStore isn't really safe to use from a worker, but for now we do so and hope that
|
||||||
|
# the races it creates aren't too bad.
|
||||||
|
|
||||||
|
SlavedKeyStore = KeyStore
|
||||||
class SlavedKeyStore(BaseSlavedStore):
|
|
||||||
_get_server_verify_key = KeyStore.__dict__[
|
|
||||||
"_get_server_verify_key"
|
|
||||||
]
|
|
||||||
|
|
||||||
get_server_verify_keys = __func__(DataStore.get_server_verify_keys)
|
|
||||||
store_server_verify_key = __func__(DataStore.store_server_verify_key)
|
|
||||||
|
|
||||||
get_server_keys_json = __func__(DataStore.get_server_keys_json)
|
|
||||||
store_server_keys_json = __func__(DataStore.store_server_keys_json)
|
|
||||||
|
|
Loading…
Reference in a new issue