Fix tests after change on OpenPGPKey.get_json API

- The main identifier of a key now is the fingerprint, not the id
  anymore
- The address is not required anymore when creating the json

1 files changed, 25 insertions, 24 deletions

diff --git a/service/pixelated/adapter/mailstore/maintenance/__init__.py b/service/pixelated/adapter/mailstore/maintenance/__init__.py
index edc442c2..9b6d6023 100644
--- a/service/pixelated/adapter/mailstore/maintenance/__init__.py
+++ b/service/pixelated/adapter/mailstore/maintenance/__init__.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.keys import KEY_TYPE_KEY, KEY_PRIVATE_KEY, KEY_ID_KEY, KEY_ADDRESS_KEY
+from leap.keymanager.keys import KEY_TYPE_KEY, KEY_PRIVATE_KEY, KEY_FINGERPRINT_KEY, KEY_ADDRESS_KEY
 from leap.keymanager.openpgp import OpenPGPKey
 
 from twisted.internet import defer
@@ -44,8 +44,8 @@ def _is_public_key(doc):
     return _is_key_doc(doc) and not doc.content.get(KEY_PRIVATE_KEY, False)
 
 
-def _key_id(doc):
-    return doc.content.get(KEY_ID_KEY, None)
+def _key_fingerprint(doc):
+    return doc.content.get(KEY_FINGERPRINT_KEY, None)
 
 
 def _address(doc):
@@ -60,40 +60,41 @@ class SoledadMaintenance(object):
     def repair(self):
         _, docs = yield self._soledad.get_all_docs()
 
-        private_key_ids = self._key_ids_with_private_key(docs)
+        private_key_fingerprints = self._key_fingerprints_with_private_key(docs)
 
         for doc in docs:
-            if _is_key_doc(doc) and _key_id(doc) not in private_key_ids:
-                logger.warn('Deleting doc %s for key %s of <%s>' % (doc.doc_id, _key_id(doc), _address(doc)))
+            if _is_key_doc(doc) and _key_fingerprint(doc) not in private_key_fingerprints:
+                logger.warn('Deleting doc %s for key %s of <%s>' % (doc.doc_id, _key_fingerprint(doc), _address(doc)))
                 yield self._soledad.delete_doc(doc)
 
-        yield self._repair_missing_active_docs(docs, private_key_ids)
+        yield self._repair_missing_active_docs(docs, private_key_fingerprints)
 
     @defer.inlineCallbacks
-    def _repair_missing_active_docs(self, docs, private_key_ids):
-        missing = self._missing_active_docs(docs, private_key_ids)
-        for key_id in missing:
-            emails = self._emails_for_key_id(docs, key_id)
+    def _repair_missing_active_docs(self, docs, private_key_fingerprints):
+        missing = self._missing_active_docs(docs, private_key_fingerprints)
+        for fingerprint in missing:
+            emails = self._emails_for_key_fingerprint(docs, fingerprint)
             for email in emails:
-                logger.warn('Re-creating active doc for key %s, email %s' % (key_id, email))
-                yield self._soledad.create_doc_from_json(OpenPGPKey(email, key_id=key_id, private=False).get_active_json(email))
+                logger.warn('Re-creating active doc for key %s, email %s' % (fingerprint, email))
+                yield self._soledad.create_doc_from_json(OpenPGPKey(email, fingerprint=fingerprint, private=False).get_active_json())
 
-    def _key_ids_with_private_key(self, docs):
-        return [doc.content[KEY_ID_KEY] for doc in docs if _is_private_key_doc(doc)]
+    def _key_fingerprints_with_private_key(self, docs):
+        return [doc.content[KEY_FINGERPRINT_KEY] for doc in docs if _is_private_key_doc(doc)]
 
-    def _missing_active_docs(self, docs, private_key_ids):
-        active_doc_ids = self._active_docs_for_key_id(docs)
+    def _missing_active_docs(self, docs, private_key_fingerprints):
+        active_doc_ids = self._active_docs_for_key_fingerprint(docs)
 
-        return set([private_key_id for private_key_id in private_key_ids if private_key_id not in active_doc_ids])
+        return set([private_key_fingerprint for private_key_fingerprint in private_key_fingerprints if private_key_fingerprint not in active_doc_ids])
 
-    def _emails_for_key_id(self, docs, key_id):
+    def _emails_for_key_fingerprint(self, docs, fingerprint):
         for doc in docs:
-            if _is_private_key_doc(doc) and _key_id(doc) == key_id:
+            if _is_private_key_doc(doc) and _key_fingerprint(doc) == fingerprint:
                 email = _address(doc)
+                if email is None:
+                    return []
                 if isinstance(email, list):
                     return email
-                else:
-                    return [email]
+                return [email]
 
-    def _active_docs_for_key_id(self, docs):
-        return [doc.content[KEY_ID_KEY] for doc in docs if _is_active_key_doc(doc) and _is_public_key(doc)]
+    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)]