1 files changed, 0 insertions, 145 deletions
diff --git a/client/src/leap/soledad/client/encdecpool.py b/client/src/leap/soledad/client/encdecpool.py
index 8eaefa77..b5cfb3ca 100644
--- a/client/src/leap/soledad/client/encdecpool.py
+++ b/client/src/leap/soledad/client/encdecpool.py
@@ -28,7 +28,6 @@ from twisted.internet import defer
 from leap.soledad.common import soledad_assert
 from leap.soledad.common.log import getLogger
 
-from leap.soledad.client.crypto import encrypt_docstr
 from leap.soledad.client.crypto import decrypt_doc_dict
 
 
@@ -104,150 +103,6 @@ class SyncEncryptDecryptPool(object):
         return self._sync_db.runQuery(query, *args)
 
 
-def encrypt_doc_task(doc_id, doc_rev, content, key, secret):
-    """
-    Encrypt the content of the given document.
-
-    :param doc_id: The document id.
-    :type doc_id: str
-    :param doc_rev: The document revision.
-    :type doc_rev: str
-    :param content: The serialized content of the document.
-    :type content: str
-    :param key: The encryption key.
-    :type key: str
-    :param secret: The Soledad storage secret (used for MAC auth).
-    :type secret: str
-
-    :return: A tuple containing the doc id, revision and encrypted content.
-    :rtype: tuple(str, str, str)
-    """
-    encrypted_content = encrypt_docstr(
-        content, doc_id, doc_rev, key, secret)
-    return doc_id, doc_rev, encrypted_content
-
-
-class SyncEncrypterPool(SyncEncryptDecryptPool):
-    """
-    Pool of workers that spawn subprocesses to execute the symmetric encryption
-    of documents to be synced.
-    """
-    TABLE_NAME = "docs_tosync"
-    FIELD_NAMES = "doc_id PRIMARY KEY, rev, content"
-
-    ENCRYPT_LOOP_PERIOD = 2
-
-    def __init__(self, *args, **kwargs):
-        """
-        Initialize the sync encrypter pool.
-        """
-        SyncEncryptDecryptPool.__init__(self, *args, **kwargs)
-        # TODO delete already synced files from database
-
-    def start(self):
-        """
-        Start the encrypter pool.
-        """
-        SyncEncryptDecryptPool.start(self)
-        logger.debug("starting the encryption loop...")
-
-    def stop(self):
-        """
-        Stop the encrypter pool.
-        """
-
-        SyncEncryptDecryptPool.stop(self)
-
-    def encrypt_doc(self, doc):
-        """
-        Encrypt document asynchronously then insert it on
-        local staging database.
-
-        :param doc: The document to be encrypted.
-        :type doc: SoledadDocument
-        """
-        soledad_assert(self._crypto is not None, "need a crypto object")
-        docstr = doc.get_json()
-        key = self._crypto.doc_passphrase(doc.doc_id)
-        secret = self._crypto.secret
-        args = doc.doc_id, doc.rev, docstr, key, secret
-        # encrypt asynchronously
-        # TODO use dedicated threadpool / move to ampoule
-        d = threads.deferToThread(
-            encrypt_doc_task, *args)
-        d.addCallback(self._encrypt_doc_cb)
-        return d
-
-    def _encrypt_doc_cb(self, result):
-        """
-        Insert results of encryption routine into the local sync database.
-
-        :param result: A tuple containing the doc id, revision and encrypted
-                       content.
-        :type result: tuple(str, str, str)
-        """
-        doc_id, doc_rev, content = result
-        return self._insert_encrypted_local_doc(doc_id, doc_rev, content)
-
-    def _insert_encrypted_local_doc(self, doc_id, doc_rev, content):
-        """
-        Insert the contents of the encrypted doc into the local sync
-        database.
-
-        :param doc_id: The document id.
-        :type doc_id: str
-        :param doc_rev: The document revision.
-        :type doc_rev: str
-        :param content: The serialized content of the document.
-        :type content: str
-        """
-        query = "INSERT OR REPLACE INTO '%s' VALUES (?, ?, ?)" \
-                % (self.TABLE_NAME,)
-        return self._runOperation(query, (doc_id, doc_rev, content))
-
-    @defer.inlineCallbacks
-    def get_encrypted_doc(self, doc_id, doc_rev):
-        """
-        Get an encrypted document from the sync db.
-
-        :param doc_id: The id of the document.
-        :type doc_id: str
-        :param doc_rev: The revision of the document.
-        :type doc_rev: str
-
-        :return: A deferred that will fire with the encrypted content of the
-                 document or None if the document was not found in the sync
-                 db.
-        :rtype: twisted.internet.defer.Deferred
-        """
-        query = "SELECT content FROM %s WHERE doc_id=? and rev=?" \
-                % self.TABLE_NAME
-        result = yield self._runQuery(query, (doc_id, doc_rev))
-        if result:
-            logger.debug("found doc on sync db: %s" % doc_id)
-            val = result.pop()
-            defer.returnValue(val[0])
-        logger.debug("did not find doc on sync db: %s" % doc_id)
-        defer.returnValue(None)
-
-    def delete_encrypted_doc(self, doc_id, doc_rev):
-        """
-        Delete an encrypted document from the sync db.
-
-        :param doc_id: The id of the document.
-        :type doc_id: str
-        :param doc_rev: The revision of the document.
-        :type doc_rev: str
-
-        :return: A deferred that will fire when the operation in the database
-                 has finished.
-        :rtype: twisted.internet.defer.Deferred
-        """
-        query = "DELETE FROM %s WHERE doc_id=? and rev=?" \
-                % self.TABLE_NAME
-        self._runOperation(query, (doc_id, doc_rev))
-
-
 def decrypt_doc_task(doc_id, doc_rev, content, gen, trans_id, key, secret,
                      idx):
     """