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

Moving lonely up to the main config instead of each Character config.

pull/2175/head
jMyles 2020-06-23 15:58:49 -07:00
parent 1e75e3e225
commit 6f40df75ad
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nucypher/cli/commands/alice.py
View File

@ -91,7 +91,6 @@ class AliceConfigOptions:
middleware: RestMiddleware, middleware: RestMiddleware,
gas_strategy: str, gas_strategy: str,
signer_uri: str, signer_uri: str,
lonely: bool,
): ):
if federated_only and geth: if federated_only and geth:
@ -117,7 +116,6 @@ class AliceConfigOptions:
self.discovery_port = discovery_port self.discovery_port = discovery_port
self.registry_filepath = registry_filepath self.registry_filepath = registry_filepath
self.middleware = middleware self.middleware = middleware
self.lonely = lonely
def create_config(self, emitter, config_file): def create_config(self, emitter, config_file):

5
nucypher/cli/commands/bob.py
View File

@ -73,7 +73,6 @@ class BobConfigOptions:
federated_only: bool, federated_only: bool,
gas_strategy: str, gas_strategy: str,
signer_uri: str, signer_uri: str,
lonely: bool,
): ):
self.provider_uri = provider_uri self.provider_uri = provider_uri
@ -86,7 +85,6 @@ class BobConfigOptions:
self.dev = dev self.dev = dev
self.middleware = middleware self.middleware = middleware
self.federated_only = federated_only self.federated_only = federated_only
self.lonely = lonely
def create_config(self, emitter: StdoutEmitter, config_file: str) -> BobConfiguration: def create_config(self, emitter: StdoutEmitter, config_file: str) -> BobConfiguration:
if self.dev: if self.dev:
@ -182,8 +180,7 @@ class BobCharacterOptions:
emitter=emitter, emitter=emitter,
unlock_keyring=not self.config_options.dev, unlock_keyring=not self.config_options.dev,
teacher_uri=self.teacher_uri, teacher_uri=self.teacher_uri,
min_stake=self.min_stake, min_stake=self.min_stake)
lonely=self.config_options.lonely)
group_character_options = group_options( group_character_options = group_options(

3
nucypher/config/node.py
View File

@ -93,6 +93,7 @@ class CharacterConfiguration(BaseConfiguration):
domains: Set[str] = None, # TODO: Mapping between learning domains and "registry" domains - #1580 domains: Set[str] = None, # TODO: Mapping between learning domains and "registry" domains - #1580
interface_signature: Signature = None, interface_signature: Signature = None,
network_middleware: RestMiddleware = None, network_middleware: RestMiddleware = None,
lonely: bool = False,
# Node Storage # Node Storage
known_nodes: set = None, known_nodes: set = None,
@ -152,6 +153,7 @@ class CharacterConfiguration(BaseConfiguration):
self.save_metadata = save_metadata self.save_metadata = save_metadata
self.reload_metadata = reload_metadata self.reload_metadata = reload_metadata
self.known_nodes = known_nodes or set() # handpicked self.known_nodes = known_nodes or set() # handpicked
self.lonely = lonely
# Configuration # Configuration
self.__dev_mode = dev_mode self.__dev_mode = dev_mode
@ -400,6 +402,7 @@ class CharacterConfiguration(BaseConfiguration):
start_learning_now=self.start_learning_now, start_learning_now=self.start_learning_now,
save_metadata=self.save_metadata, save_metadata=self.save_metadata,
node_storage=self.node_storage.payload(), node_storage=self.node_storage.payload(),
lonely=self.lonely,
) )
# Optional values (mode) # Optional values (mode)