diff options
| author | Tulio Casagrande <tcasagra@thoughtworks.com> | 2017-04-10 18:45:17 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2017-12-03 20:43:36 +0100 |
| commit | 873012e432cd6125c3174a2bc6ef9498166d94ea (patch) | |
| tree | d86747a9ada4257bf26af054545dfe0bdf70a7e3 | |
| parent | 425c22591e379a314dd9eae80510223a12ddea67 (diff) | |
[bug] specify _get_inactive_private_keys as a private method
| -rw-r--r-- | src/leap/bitmask/keymanager/__init__.py | 4 | ||||
| -rw-r--r-- | tests/integration/keymanager/test_keymanager.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py index 9240b8a5..b6c36d3c 100644 --- a/src/leap/bitmask/keymanager/__init__.py +++ b/src/leap/bitmask/keymanager/__init__.py @@ -208,7 +208,7 @@ class KeyManager(object): raw_key, address=address, validation=validation_level) @defer.inlineCallbacks - def get_inactive_private_keys(self): + def _get_inactive_private_keys(self): """ Return all inactive private keys bound to address, that are stored locally. @@ -555,7 +555,7 @@ class KeyManager(object): result = yield _decrypt(keys) except keymanager_errors.DecryptError as e: verify_key, active_key = keys - inactive_keys = yield self.get_inactive_private_keys() + inactive_keys = yield self._get_inactive_private_keys() result = yield decrypt_with_inactive_keys(inactive_keys, verify_key, e) defer.returnValue(result) diff --git a/tests/integration/keymanager/test_keymanager.py b/tests/integration/keymanager/test_keymanager.py index 474643d4..334b3356 100644 --- a/tests/integration/keymanager/test_keymanager.py +++ b/tests/integration/keymanager/test_keymanager.py @@ -223,7 +223,7 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase): yield km._openpgp.put_raw_key(PRIVATE_KEY, ADDRESS) yield km._openpgp.put_raw_key(DIFFERENT_PRIVATE_KEY, ADDRESS) # get the key - inactive_keys = yield km.get_inactive_private_keys() + inactive_keys = yield km._get_inactive_private_keys() active_key = yield km.get_key( ADDRESS, private=True, fetch_remote=False) self.assertEqual(1, len(inactive_keys)) @@ -627,7 +627,7 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase): old_key = yield km.get_key(ADDRESS_EXPIRING, fetch_remote=False) new_key = yield km.regenerate_key() - inactive_private_keys = yield km.get_inactive_private_keys() + inactive_private_keys = yield km._get_inactive_private_keys() renewed_public_key = yield km.get_key(ADDRESS_EXPIRING, private=False, fetch_remote=False) |