From 5862cb1db30fe4b748427cae663d4f3be3dd7af8 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Tue, 4 Aug 2015 14:28:48 -0300 Subject: [refactor] Extracts get_key logic, sharing it This avoids direct access to keymanager and reuses logic from NickNym class. -- Issue #422 --- service/pixelated/config/services.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'service/pixelated/config') diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 2b739acd..a45f9a99 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -35,7 +35,7 @@ class Services(object): self.search_engine, pixelated_mailboxes) - self.keymanager = self.setup_keymanager(leap_session) + self.keymanager = leap_session.nicknym self.draft_service = self.setup_draft_service(pixelated_mailboxes) yield self.post_setup(soledad_querier, leap_session) @@ -48,9 +48,6 @@ class Services(object): # yield soledad_querier.remove_duplicates() InputMail.FROM_EMAIL_ADDRESS = leap_session.account_email() - def setup_keymanager(self, leap_session): - return leap_session.nicknym.keymanager - @defer.inlineCallbacks def setup_search_engine(self, leap_home, soledad_querier): key = yield soledad_querier.get_index_masterkey() -- cgit v1.2.3