Merge remote-tracking branch 'drebs/feature/2349-add-mac-auth-3' into develop

1 files changed, 4 insertions, 6 deletions

diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index c4282c0f..60261111 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -52,10 +52,9 @@ from leap.soledad.backends.sqlcipher import open as u1db_open
 from leap.soledad.backends.leap_backend import (
     LeapDocument,
     EncryptionSchemes,
-    decrypt_doc_json,
+    decrypt_doc,
     ENC_JSON_KEY,
     ENC_SCHEME_KEY,
-    MAC_KEY,
 )
 
 
@@ -634,9 +633,7 @@ class SQLCipherDatabaseSyncTests(
         self.sync(self.db2, db3)
         doc3 = db3.get_doc('the-doc')
         if ENC_SCHEME_KEY in doc3.content:
-            doc3.set_json(
-                decrypt_doc_json(
-                    self._soledad._crypto, doc3.doc_id, doc3.get_json()))
+            doc3.set_json(decrypt_doc(self._soledad._crypto, doc3))
         self.assertEqual(doc4.get_json(), doc3.get_json())
         self.assertFalse(doc3.has_conflicts)
 
@@ -715,7 +712,8 @@ class SQLCipherSyncTargetTests(
         sever-side.
         """
         docs_by_gen = [
-            (self.make_document('doc-id', 'replica:1', tests.simple_doc), 10, 'T-1'),
+            (self.make_document(
+                'doc-id', 'replica:1', tests.simple_doc), 10, 'T-1'),
             (self.make_document('doc-id2', 'replica:1', tests.nested_doc), 11,
              'T-2')]
         new_gen, trans_id = self.st.sync_exchange(