Update keymanager calls due api update

Some keymanager api was updated, so we needed to update some calls.

5 files changed, 19 insertions, 18 deletions

diff --git a/service/pixelated/adapter/mailstore/maintenance/__init__.py b/service/pixelated/adapter/mailstore/maintenance/__init__.py
index 9b6d6023..2e6c24c6 100644
--- a/service/pixelated/adapter/mailstore/maintenance/__init__.py
+++ b/service/pixelated/adapter/mailstore/maintenance/__init__.py
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from leap.keymanager.keys import KEY_TYPE_KEY, KEY_PRIVATE_KEY, KEY_FINGERPRINT_KEY, KEY_ADDRESS_KEY
-from leap.keymanager.openpgp import OpenPGPKey
+from leap.keymanager import documents as leap_doc
+from leap.keymanager.keys import OpenPGPKey
 
 from twisted.internet import defer
 import logging
@@ -29,27 +29,27 @@ logger = logging.getLogger(__name__)
 
 
 def _is_key_doc(doc):
-    return doc.content.get(KEY_TYPE_KEY, None) in KEY_DOC_TYPES
+    return doc.content.get(leap_doc.KEY_TYPE_KEY, None) in KEY_DOC_TYPES
 
 
 def _is_private_key_doc(doc):
-    return _is_key_doc(doc) and doc.content.get(KEY_PRIVATE_KEY, False)
+    return _is_key_doc(doc) and doc.content.get(leap_doc.KEY_PRIVATE_KEY, False)
 
 
 def _is_active_key_doc(doc):
-    return _is_key_doc(doc) and doc.content.get(KEY_TYPE_KEY, None) == TYPE_OPENPGP_ACTIVE
+    return _is_key_doc(doc) and doc.content.get(leap_doc.KEY_TYPE_KEY, None) == TYPE_OPENPGP_ACTIVE
 
 
 def _is_public_key(doc):
-    return _is_key_doc(doc) and not doc.content.get(KEY_PRIVATE_KEY, False)
+    return _is_key_doc(doc) and not doc.content.get(leap_doc.KEY_PRIVATE_KEY, False)
 
 
 def _key_fingerprint(doc):
-    return doc.content.get(KEY_FINGERPRINT_KEY, None)
+    return doc.content.get(leap_doc.KEY_FINGERPRINT_KEY, None)
 
 
 def _address(doc):
-    return doc.content.get(KEY_ADDRESS_KEY, None)
+    return doc.content.get(leap_doc.KEY_ADDRESS_KEY, None)
 
 
 class SoledadMaintenance(object):
@@ -79,7 +79,7 @@ class SoledadMaintenance(object):
                 yield self._soledad.create_doc_from_json(OpenPGPKey(email, fingerprint=fingerprint, private=False).get_active_json())
 
     def _key_fingerprints_with_private_key(self, docs):
-        return [doc.content[KEY_FINGERPRINT_KEY] for doc in docs if _is_private_key_doc(doc)]
+        return [doc.content[leap_doc.KEY_FINGERPRINT_KEY] for doc in docs if _is_private_key_doc(doc)]
 
     def _missing_active_docs(self, docs, private_key_fingerprints):
         active_doc_ids = self._active_docs_for_key_fingerprint(docs)
@@ -97,4 +97,4 @@ class SoledadMaintenance(object):
                 return [email]
 
     def _active_docs_for_key_fingerprint(self, docs):
-        return [doc.content[KEY_FINGERPRINT_KEY] for doc in docs if _is_active_key_doc(doc) and _is_public_key(doc)]
+        return [doc.content[leap_doc.KEY_FINGERPRINT_KEY] for doc in docs if _is_active_key_doc(doc) and _is_public_key(doc)]
diff --git a/service/pixelated/bitmask_libraries/nicknym.py b/service/pixelated/bitmask_libraries/nicknym.py
index 7c9ffe8c..aeedab2c 100644
--- a/service/pixelated/bitmask_libraries/nicknym.py
+++ b/service/pixelated/bitmask_libraries/nicknym.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from leap.keymanager import KeyManager, openpgp, KeyNotFound
+from leap.keymanager import KeyManager, KeyNotFound
 from .certs import LeapCertificate
 from twisted.internet import defer
 import logging
@@ -48,13 +48,13 @@ class NickNym(object):
             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)
+        return self.keymanager.get_key(email, private=private, fetch_remote=fetch_remote)
 
     def _gen_key(self):
-        return self.keymanager.gen_key(openpgp.OpenPGPKey)
+        return self.keymanager.gen_key()
 
     def _send_key_to_leap(self):
-        return self.keymanager.send_key(openpgp.OpenPGPKey)
+        return self.keymanager.send_key()
 
 
 def _discover_nicknym_server(provider):
diff --git a/service/test/unit/bitmask_libraries/test_nicknym.py b/service/test/unit/bitmask_libraries/test_nicknym.py
index e75bc913..d15f1a75 100644
--- a/service/test/unit/bitmask_libraries/test_nicknym.py
+++ b/service/test/unit/bitmask_libraries/test_nicknym.py
@@ -62,5 +62,5 @@ class NickNymTest(AbstractLeapTest):
         # when/then
         nicknym.generate_openpgp_key()
 
-        keyman.get_key.assert_called_with('test_user@some-server.test', openpgp.OpenPGPKey, private=True, fetch_remote=False)
-        keyman.gen_key.assert_called_with(openpgp.OpenPGPKey)
+        keyman.get_key.assert_called_with('test_user@some-server.test', private=True, fetch_remote=False)
+        keyman.gen_key.assert_called()
diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py
index 2bf53cb4..4aae8713 100644
--- a/service/test/unit/resources/test_keys_resources.py
+++ b/service/test/unit/resources/test_keys_resources.py
@@ -1,7 +1,8 @@
 import json
 import ast
 from mockito import mock, when, any as ANY
-from leap.keymanager import OpenPGPKey, KeyNotFound
+from leap.keymanager import KeyNotFound
+from leap.keymanager.keys import OpenPGPKey
 
 from pixelated.application import ServicesFactory, UserAgentMode
 from pixelated.resources.keys_resource import KeysResource
diff --git a/service/test/unit/resources/test_user_settings_resource.py b/service/test/unit/resources/test_user_settings_resource.py
index d69f4895..42626cd5 100644
--- a/service/test/unit/resources/test_user_settings_resource.py
+++ b/service/test/unit/resources/test_user_settings_resource.py
@@ -7,7 +7,7 @@ from pixelated.resources.user_settings_resource import UserSettingsResource, FIN
 from mockito import mock, when, any
 from test.unit.resources import DummySite
 from twisted.web.test.requesthelper import DummyRequest
-from leap.keymanager import OpenPGPKey
+from leap.keymanager.keys import OpenPGPKey
 from twisted.internet import defer
 from twisted.python.failure import Failure