Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Different approach to write_keyring override.

pull/632/head
jMyles 2019-01-11 14:57:30 -05:00
parent 706614cd93
commit ed08f733d4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nucypher/config/characters.py
View File

@ -101,19 +101,17 @@ class UrsulaConfiguration(NodeConfiguration):
password: str,
encrypting: bool = True,
wallet: bool = True,
**generation_kwargs,
) -> NucypherKeyring:
host = self.rest_host
tls_curve = self.tls_curve
generation_kwargs["rest"] = True
generation_kwargs["host"] = self.rest_host
generation_kwargs["curve"] = self.tls_curve
self.keyring = NucypherKeyring.generate(password=password,
encrypting=encrypting,
wallet=wallet,
rest=True,
host=host,
# checksum_address=checksum_address, # TODO: Do we actually want to allow passing this? Or force the use of the new address that comes from the wallet being created?
curve=tls_curve,
keyring_root=self.keyring_dir)
return super().write_keyring(password=password,
encrypting=True,
wallet=True,
**generation_kwargs)
class AliceConfiguration(NodeConfiguration):

4
nucypher/config/node.py
View File

@ -559,12 +559,14 @@ class NodeConfiguration(ABC):
password: str,
encrypting: bool = True,
wallet: bool = False,
**generation_kwargs,
) -> NucypherKeyring:
self.keyring = NucypherKeyring.generate(password=password,
encrypting=encrypting,
wallet=wallet,
keyring_root=self.keyring_dir)
keyring_root=self.keyring_dir,
**generation_kwargs)
# TODO: Operating mode switch #466
if self.federated_only or not wallet: