From 5862cb1db30fe4b748427cae663d4f3be3dd7af8 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 4 Aug 2015 14:28:48 -0300 Subject: [refactor] Extracts get_key logic, sharing it This avoids direct access to keymanager and reuses logic from NickNym class. -- Issue #422 --- service/pixelated/bitmask_libraries/nicknym.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'service/pixelated/bitmask_libraries') diff --git a/service/pixelated/bitmask_libraries/nicknym.py b/service/pixelated/bitmask_libraries/nicknym.py index 810161ee..826ecb58 100644 --- a/service/pixelated/bitmask_libraries/nicknym.py +++ b/service/pixelated/bitmask_libraries/nicknym.py @@ -40,11 +40,14 @@ class NickNym(object): @defer.inlineCallbacks def _key_exists(self, email): try: - yield self.keymanager.get_key(email, openpgp.OpenPGPKey, private=True, fetch_remote=False) + yield self.fetch_key(email, private=True, fetch_remote=False) defer.returnValue(True) except KeyNotFound: defer.returnValue(False) + def fetch_key(self, email, private=False, fetch_remote=True): + return self.keymanager.get_key(email, openpgp.OpenPGPKey, private=private, fetch_remote=fetch_remote) + def _gen_key(self): return self.keymanager.gen_key(openpgp.OpenPGPKey) -- cgit v1.2.3