diff --git a/nucypher/cli/main.py b/nucypher/cli/main.py index aace4c7fc..33b273bf5 100644 --- a/nucypher/cli/main.py +++ b/nucypher/cli/main.py @@ -286,7 +286,7 @@ def ursula(click_config, except CryptoError: raise ursula_config.keyring.AuthenticationFailed - if not federated_only: + if not ursula_config.federated_only: ursula_config.connect_to_blockchain(recompile_contracts=False) ursula_config.connect_to_contracts() diff --git a/tests/cli/commands/test_federated_ursula.py b/tests/cli/commands/test_federated_ursula.py index 1ea3de011..42b7d772a 100644 --- a/tests/cli/commands/test_federated_ursula.py +++ b/tests/cli/commands/test_federated_ursula.py @@ -83,7 +83,7 @@ def test_initialize_custom_configuration_root(custom_filepath, click_runner): assert 'Repeat for confirmation:' in result.output, 'User was not prompted to confirm password' -def test_configuration_file_contents(custom_filepath, nominal_configuration_fields): +def test_configuration_file_contents(custom_filepath, nominal_federated_configuration_fields): custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME) assert os.path.isfile(custom_config_filepath), 'Configuration file does not exist' @@ -96,7 +96,7 @@ def test_configuration_file_contents(custom_filepath, nominal_configuration_fiel except JSONDecodeError: raise pytest.fail(msg="Invalid JSON configuration file {}".format(custom_config_filepath)) - for field in nominal_configuration_fields: + for field in nominal_federated_configuration_fields: assert field in data, "Missing field '{}' from configuration file." if any(keyword in field for keyword in ('path', 'dir')): path = data[field] @@ -126,7 +126,7 @@ def test_password_prompt(click_runner, custom_filepath): assert result.exit_code == 0 -def test_ursula_view_configuration(custom_filepath, click_runner, nominal_configuration_fields): +def test_ursula_view_configuration(custom_filepath, click_runner, nominal_federated_configuration_fields): # Ensure the configuration file still exists custom_config_filepath = os.path.join(custom_filepath, UrsulaConfiguration.CONFIG_FILENAME) @@ -142,7 +142,7 @@ def test_ursula_view_configuration(custom_filepath, click_runner, nominal_config # CLI Output assert 'password' in result.output, 'WARNING: User was not prompted for password' assert MOCK_CUSTOM_INSTALLATION_PATH in result.output - for field in nominal_configuration_fields: + for field in nominal_federated_configuration_fields: assert field in result.output, "Missing field '{}' from configuration file." # Make sure nothing crazy is happening... diff --git a/tests/cli/conftest.py b/tests/cli/conftest.py index 8dbf10c10..c95b5da50 100644 --- a/tests/cli/conftest.py +++ b/tests/cli/conftest.py @@ -33,8 +33,8 @@ def click_runner(): @pytest.fixture(scope='module') -def nominal_configuration_fields(): - config = UrsulaConfiguration(dev_mode=True) +def nominal_federated_configuration_fields(): + config = UrsulaConfiguration(dev_mode=True, federated_only=True) config_fields = config.static_payload del config_fields['is_me'] yield tuple(config_fields.keys())