diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-08-04 14:28:48 -0300 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:31 +0200 |
| commit | 5862cb1db30fe4b748427cae663d4f3be3dd7af8 (patch) | |
| tree | 51d8716052fc3b4227018b562b7d5c8c300624b9 /service/pixelated/config | |
| parent | a7c84d6faf5ddd7866ce4c0508e03c7c3779eaca (diff) | |
[refactor] Extracts get_key logic, sharing it
This avoids direct access to keymanager and reuses logic from NickNym
class.
-- Issue #422
Diffstat (limited to 'service/pixelated/config')
| -rw-r--r-- | service/pixelated/config/services.py | 5 |
1 files changed, 1 insertions, 4 deletions
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() |