Remove get_key_from_cache

We only need to cache the fetch with a sort timeout. The tests that
fetches keys now have to use different keys or will be cached.

2 files changed, 5 insertions, 11 deletions

diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index fe9f02cb..37eb2233 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -189,6 +189,7 @@ class KeyManager(object):
         res.raise_for_status()
         return res
 
+    @memoized_method(invalidation=300)
     def _fetch_keys_from_server(self, address):
         """
         Fetch keys bound to C{address} from nickserver and insert them in
@@ -249,13 +250,6 @@ class KeyManager(object):
         self._put(uri, data)
         signal(proto.KEYMANAGER_DONE_UPLOADING_KEYS, self._address)
 
-    @memoized_method
-    def get_key_from_cache(self, *args, **kwargs):
-        """
-        Public interface to `get_key`, that is memoized.
-        """
-        return self.get_key(*args, **kwargs)
-
     def get_key(self, address, ktype, private=False, fetch_remote=True):
         """
         Return a key of type C{ktype} bound to C{address}.
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py
index 932f2602..f9ba04f6 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/src/leap/keymanager/tests/test_keymanager.py
@@ -448,7 +448,7 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
             headers = {'content-type': 'application/json'}
 
             def json(self):
-                return {'address': ADDRESS_2, 'openpgp': PUBLIC_KEY_2}
+                return {'address': ADDRESS, 'openpgp': PUBLIC_KEY}
 
             def raise_for_status(self):
                 pass
@@ -458,13 +458,13 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         km.ca_cert_path = 'cacertpath'
         # try to key get without fetching from server
         self.assertRaises(
-            KeyNotFound, km.get_key, ADDRESS_2, OpenPGPKey,
+            KeyNotFound, km.get_key, ADDRESS, OpenPGPKey,
             fetch_remote=False
         )
         # try to get key fetching from server.
-        key = km.get_key(ADDRESS_2, OpenPGPKey)
+        key = km.get_key(ADDRESS, OpenPGPKey)
         self.assertIsInstance(key, OpenPGPKey)
-        self.assertEqual(ADDRESS_2, key.address)
+        self.assertEqual(ADDRESS, key.address)
 
 
 class KeyManagerCryptoTestCase(KeyManagerWithSoledadTestCase):