From 8713e0bc40ae8b7251f58e570ecaf13511a97136 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 13 Sep 2016 15:30:47 -0300 Subject: [#778] Renaming get_key to be consistent with keymanager --- service/pixelated/bitmask_libraries/keymanager.py | 5 ++--- service/pixelated/resources/keys_resource.py | 2 +- service/pixelated/resources/user_settings_resource.py | 2 +- service/test/unit/extensions/test_keymanager_fetch_key.py | 1 - service/test/unit/resources/test_keys_resources.py | 6 +++--- service/test/unit/resources/test_user_settings_resource.py | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/service/pixelated/bitmask_libraries/keymanager.py b/service/pixelated/bitmask_libraries/keymanager.py index 0ab91184..4cb3e80e 100644 --- a/service/pixelated/bitmask_libraries/keymanager.py +++ b/service/pixelated/bitmask_libraries/keymanager.py @@ -15,7 +15,6 @@ # along with Pixelated. If not, see . from leap.keymanager import KeyManager, KeyNotFound from pixelated.config import leap_config -from .certs import LeapCertificate from twisted.internet import defer import logging @@ -44,12 +43,12 @@ class Keymanager(object): @defer.inlineCallbacks def _key_exists(self, email): try: - yield self.fetch_key(email, private=True, fetch_remote=False) + yield self.get_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): + def get_key(self, email, private=False, fetch_remote=True): return self.keymanager.get_key(email, private=private, fetch_remote=fetch_remote) def _gen_key(self): diff --git a/service/pixelated/resources/keys_resource.py b/service/pixelated/resources/keys_resource.py index 9075ab9e..e3d0733e 100644 --- a/service/pixelated/resources/keys_resource.py +++ b/service/pixelated/resources/keys_resource.py @@ -23,7 +23,7 @@ class KeysResource(BaseResource): respond_json_deferred(None, request, status_code=404) _, key_to_find = parseaddr(request.args.get('search')[0]) - d = _keymanager.fetch_key(key_to_find) + d = _keymanager.get_key(key_to_find) d.addCallback(finish_request) d.addErrback(key_not_found) diff --git a/service/pixelated/resources/user_settings_resource.py b/service/pixelated/resources/user_settings_resource.py index 38997b30..04b434bd 100644 --- a/service/pixelated/resources/user_settings_resource.py +++ b/service/pixelated/resources/user_settings_resource.py @@ -36,7 +36,7 @@ class UserSettingsResource(BaseResource): def key_not_found(_): respond_json_deferred({'account_email': _account_email, 'fingerprint': FINGERPRINT_NOT_FOUND}, request) - d = self.keymanager(request).fetch_key(_account_email) + d = self.keymanager(request).get_key(_account_email) d.addCallback(finish_request) d.addErrback(key_not_found) diff --git a/service/test/unit/extensions/test_keymanager_fetch_key.py b/service/test/unit/extensions/test_keymanager_fetch_key.py index 8998198d..ef7d67d2 100644 --- a/service/test/unit/extensions/test_keymanager_fetch_key.py +++ b/service/test/unit/extensions/test_keymanager_fetch_key.py @@ -20,7 +20,6 @@ from leap.keymanager import KeyManager from leap.keymanager.keys import KEY_ADDRESS_KEY, KEY_TYPE_KEY, KEY_ID_KEY, KEY_FINGERPRINT_KEY, KEY_DATA_KEY, KEY_PRIVATE_KEY, KEY_LENGTH_KEY, KEY_EXPIRY_DATE_KEY, KEY_FIRST_SEEN_AT_KEY, KEY_LAST_AUDITED_AT_KEY, KEY_VALIDATION_KEY, KEY_TAGS_KEY from leap.keymanager.openpgp import OpenPGPKey from leap.keymanager.errors import KeyNotFound -import pixelated.support.ext_keymanager_fetch_key from requests.exceptions import HTTPError diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py index 91c286c9..a7c885ca 100644 --- a/service/test/unit/resources/test_keys_resources.py +++ b/service/test/unit/resources/test_keys_resources.py @@ -28,7 +28,7 @@ class TestKeysResource(unittest.TestCase): def test_returns_404_if_key_not_found(self): request = DummyRequest(['/keys']) request.addArg('search', 'some@inexistent.key') - when(self.keymanager).fetch_key('some@inexistent.key').thenReturn(defer.fail(KeyNotFound())) + when(self.keymanager).get_key('some@inexistent.key').thenReturn(defer.fail(KeyNotFound())) d = self.web.get(request) @@ -41,7 +41,7 @@ class TestKeysResource(unittest.TestCase): def test_returns_the_key_as_json_if_found(self): request = DummyRequest(['/keys']) request.addArg('search', 'some@key') - when(self.keymanager).fetch_key('some@key').thenReturn(defer.succeed(OpenPGPKey('some@key'))) + when(self.keymanager).get_key('some@key').thenReturn(defer.succeed(OpenPGPKey('some@key'))) d = self.web.get(request) @@ -68,7 +68,7 @@ class TestKeysResource(unittest.TestCase): def test_returns_unauthorized_if_key_is_private(self): request = DummyRequest(['/keys']) request.addArg('search', 'some@key') - when(self.keymanager).fetch_key('some@key').thenReturn(defer.succeed(OpenPGPKey('some@key', private=True))) + when(self.keymanager).get_key('some@key').thenReturn(defer.succeed(OpenPGPKey('some@key', private=True))) d = self.web.get(request) diff --git a/service/test/unit/resources/test_user_settings_resource.py b/service/test/unit/resources/test_user_settings_resource.py index 42626cd5..a33ad571 100644 --- a/service/test/unit/resources/test_user_settings_resource.py +++ b/service/test/unit/resources/test_user_settings_resource.py @@ -35,7 +35,7 @@ class TestUserSettingsResource(unittest.TestCase): key = OpenPGPKey(MAIL_ADDRESS) key.fingerprint = FINGERPRINT request = DummyRequest(['/user-settings']) - when(self.keymanager).fetch_key(MAIL_ADDRESS).thenReturn(defer.succeed(key)) + when(self.keymanager).get_key(MAIL_ADDRESS).thenReturn(defer.succeed(key)) d = self.web.get(request) @@ -51,7 +51,7 @@ class TestUserSettingsResource(unittest.TestCase): key = OpenPGPKey(MAIL_ADDRESS) key.fingerprint = FINGERPRINT request = DummyRequest(['/user-settings']) - when(self.keymanager).fetch_key(MAIL_ADDRESS).thenReturn(defer.fail(Failure)) + when(self.keymanager).get_key(MAIL_ADDRESS).thenReturn(defer.fail(Failure)) d = self.web.get(request) -- cgit v1.2.3