Started deferring leap session creation #759

Started adapting get_leap_session to deferreds

Soledad and keymanager setup calls will now
happen in deferreds and leap session creation
itself is a deferred with callbacks

This is a start in breaking the big blocking
calls we were doing on the main thread, this
was done without changing code inside the
leap libraries yet so things can be further
optimized

This breaks the ~4 seconds get_leap_session
piece into smaller 1 seconds one, that can be
further optimized and deferred to even smaller
calls

There are requests calls happening on the main
thread that should get this number even further
down

Also moved some pieces from bitmask libraries
to our bootstrap, because they are not bitmask
libraries anymore and that was causing confusion

1 files changed, 8 insertions, 9 deletions

diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py
index 9d0a35c4..b14aacc7 100644
--- a/service/pixelated/config/leap.py
+++ b/service/pixelated/config/leap.py
@@ -6,10 +6,10 @@ from leap.soledad.common.errors import InvalidAuthTokenError
 from leap.auth import SRPAuth
 
 from pixelated.config import credentials
-from pixelated.bitmask_libraries.config import LeapConfig
+from pixelated.config import leap_config
 from pixelated.bitmask_libraries.certs import LeapCertificate
 from pixelated.bitmask_libraries.provider import LeapProvider
-from pixelated.bitmask_libraries.session import LeapSessionFactory
+from pixelated.config.sessions import LeapSessionFactory
 
 log = logging.getLogger(__name__)
 
@@ -17,13 +17,12 @@ log = logging.getLogger(__name__)
 def initialize_leap_provider(provider_hostname, provider_cert, provider_fingerprint, leap_home):
     LeapCertificate.set_cert_and_fingerprint(provider_cert,
                                              provider_fingerprint)
-
-    config = LeapConfig(leap_home=leap_home, start_background_jobs=True)
-    provider = LeapProvider(provider_hostname, config)
+    leap_config.set_leap_home(leap_home)
+    provider = LeapProvider(provider_hostname)
     provider.download_certificate()
     LeapCertificate(provider).setup_ca_bundle()
 
-    return config, provider
+    return provider
 
 
 @defer.inlineCallbacks
@@ -40,16 +39,16 @@ def initialize_leap_multi_user(provider_hostname,
 
 @defer.inlineCallbacks
 def create_leap_session(provider, username, password, auth=None):
-    leap_session = LeapSessionFactory(provider).create(username, password, auth)
+    leap_session = yield LeapSessionFactory(provider).create(username, password, auth)
     try:
-        yield leap_session.initial_sync()
+        yield leap_session.first_required_sync()
     except InvalidAuthTokenError:
         try:
             leap_session.close()
         except Exception, e:
             log.error(e)
         leap_session = LeapSessionFactory(provider).create(username, password, auth)
-        yield leap_session.initial_sync()
+        yield leap_session.first_required_sync()
 
     defer.returnValue(leap_session)