Revert "Fix soledad imports (#5989)."

This reverts commit 93750f23.

changes/bug_5989_fix-soledad-imports

-- Fix soledad imports (#5989).

src/leap/bitmask/backend/components.py

@@ -61,7 +61,7 @@ from leap.common import certs as leap_certs
 from leap.keymanager import openpgp
 from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch
 
-from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort
+from leap.soledad.client import NoStorageSecret, PassphraseTooShort
 
 logger = logging.getLogger(__name__)
 

src/leap/bitmask/services/soledad/soledadbootstrapper.py

@@ -45,8 +45,7 @@ from leap.common.files import which
 from leap.keymanager import KeyManager, openpgp
 from leap.keymanager.errors import KeyNotFound
 from leap.soledad.common.errors import InvalidAuthTokenError
-from leap.soledad.client import Soledad
-from leap.soledad.client.secrets import BootstrapSequenceError
+from leap.soledad.client import Soledad, BootstrapSequenceError
 
 logger = logging.getLogger(__name__)