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

Update CI to include config tests; Reorganize; Fix glob pattern; Localize utility functions in CLI.

pull/476/head
Kieran Prasch 2018-10-09 19:41:28 -07:00
parent a945508a30
commit 85b42f639f
3 changed files with 94 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.circleci/config.yml
View File

@ -5,37 +5,45 @@ workflows:
test:
jobs:
- bundle_dependencies-36
- mypy_type_check:
- eth_contract_unit:
requires:
- bundle_dependencies-36
- eth_contract_unit:
- config_unit:
requires:
- bundle_dependencies-36
- crypto_unit:
requires:
- bundle_dependencies-36
- bundle_dependencies-36
- network_unit:
requires:
- bundle_dependencies-36
- bundle_dependencies-36
- keystore_unit:
requires:
- bundle_dependencies-36
- bundle_dependencies-36
- blockchain_interface_unit:
requires:
- bundle_dependencies-36
- bundle_dependencies-36
- character:
requires:
- crypto_unit
- network_unit
- keystore_unit
- bundle_dependencies-36
- intercontract_integration:
requires:
- eth_contract_unit
- nucypher_cli_tests:
- mypy_type_check:
requires:
- crypto_unit
- network_unit
- keystore_unit
- config_unit
- crypto_unit
- network_unit
- keystore_unit
- character
- cli_tests:
requires:
- blockchain_interface_unit
- config_unit
- crypto_unit
- network_unit
- keystore_unit
- character
python_36_base: &python_36_base
working_directory: ~/nucypher-depends
@ -50,7 +58,7 @@ jobs:
- run:
name: Install Python Dependencies with Pipenv
command: |
pip3 install pip==18.0
pip3 install --user pip==18.0
pipenv install --three --dev --skip-lock --verbose
- run:
name: Install Solidity Compiler
@ -82,7 +90,19 @@ jobs:
- run:
name: Ethereum Contract Unit Tests
command: |
pipenv run pytest --junitxml=./reports/pytest/eth-contract-unit-report.xml -v --runslow $(circleci tests glob tests/blockchain/eth/contracts/*/test_*.py | circleci tests split --split-by=timings)
pipenv run pytest --junitxml=./reports/pytest/eth-contract-unit-report.xml -v --runslow $(circleci tests glob tests/blockchain/eth/contracts/**/**/test_*.py | circleci tests split --split-by=timings)
- store_test_results:
path: ./reports/pytest/
config_unit:
<<: *python_36_base
steps:
- checkout
- attach_workspace:
at: ~/.local/share/virtualenvs/
- run:
name: Node Configuration Tests
command: pipenv run pytest --cov=nucypher/config -v --runslow tests/config --junitxml=./reports/pytest/results.xml
- store_test_results:
path: ./reports/pytest/
@ -147,7 +167,7 @@ jobs:
- store_test_results:
path: ./reports/pytest/
nucypher_cli_tests:
cli_tests:
<<: *python_36_base
steps:
- checkout
@ -171,7 +191,7 @@ jobs:
command: |
pipenv run pip install lxml
- run:
name: Run Mypy Static Type Checks
name: Run Mypy Static Type Checks (Always Succeed)
command: |
mkdir ./mypy_reports ./mypy_results
export MYPYPATH=./nucypher

5
Pipfile
View File

@ -53,6 +53,11 @@ py-solc = "*"
#eth-tester = "*"
eth-tester = {git = "https://github.com/KPrasch/eth-tester.git", ref = "ef4bb2fa793af8aa964b83536b20f525aa74d4e4"}
py-evm = ">=0.2.0a31"
#
# CLI
#
moto = "*"
boto3 = "*"
nucypher = {editable = true, path = "."}
[pipenv]

104
cli/main.py
View File

@ -29,25 +29,14 @@ from nucypher.config.characters import UrsulaConfiguration
from nucypher.config.constants import BASE_DIR
from nucypher.config.keyring import NucypherKeyring
from nucypher.config.node import NodeConfiguration
from nucypher.config.utils import validate_configuration_file, generate_local_wallet, generate_account
from nucypher.utilities.sandbox.blockchain import TesterBlockchain, token_airdrop
from nucypher.utilities.sandbox.constants import (DEVELOPMENT_TOKEN_AIRDROP_AMOUNT,
DEVELOPMENT_ETH_AIRDROP_AMOUNT,
DEFAULT_SIMULATION_REGISTRY_FILEPATH)
from nucypher.utilities.sandbox.ursula import UrsulaProcessProtocol
__version__ = '0.1.0-alpha.0'
def echo_version(ctx, param, value):
if not value or ctx.resilient_parsing:
return
click.secho(__version__, bold=True)
ctx.exit()
DEBUG = True
BANNER = """
_
| |
@ -63,10 +52,14 @@ BANNER = """
""".format(__version__)
#
# Setup Logging
#
def echo_version(ctx, param, value):
if not value or ctx.resilient_parsing:
return
click.secho(BANNER, bold=True)
ctx.exit()
# Setup Logging
root = logging.getLogger()
root.setLevel(logging.DEBUG)
@ -81,9 +74,14 @@ root.addHandler(ch)
# CLI Configuration
#
# CLI Constants
DEBUG = True
KEYRING_PASSPHRASE_ENVVAR = 'NUCYPHER_KEYRING_PASSPHRASE'
# Pending Configuration Named Tuple
fields = 'passphrase wallet signing tls skip_keys save_file'.split()
PendingConfigurationDetails = collections.namedtuple('PendingConfigurationDetails', fields)
KEYRING_PASSPHRASE_ENVVAR = 'NUCYPHER_KEYRING_PASSPHRASE'
class NucypherClickConfig:
@ -167,12 +165,15 @@ class NucypherClickConfig:
passphrase = click.prompt(message, hide_input=True, confirmation_prompt=True)
if choice == 'local':
keyring = generate_local_wallet(passphrase=passphrase, keyring_root=self.node_configuration.keyring_dir)
keyring = NucypherKeyring.generate(passphrase=passphrase,
keyring_root=self.node_configuration.keyring_dir,
encrypting=False,
wallet=True)
new_address = keyring.checksum_address
elif choice == 'hosted':
new_address = generate_account(w3=self.blockchain.interface.w3, passphrase=passphrase)
new_address = self.blockchain.interface.w3.personal.newAccount(passphrase)
else:
raise click.Abort()
raise click.BadParameter("Invalid choice; Options are hosted or local.")
return new_address
def _collect_pending_configuration_details(self, ursula: bool=False, force: bool = False) -> PendingConfigurationDetails:
@ -235,12 +236,12 @@ class NucypherClickConfig:
try:
pending_config = self._collect_pending_configuration_details(force=force, ursula=ursula)
new_installation_path = self.node_configuration.write(passphrase=pending_config.passphrase,
wallet=pending_config.wallet,
encrypting=pending_config.signing,
tls=pending_config.tls,
no_registry=no_registry,
no_keys=pending_config.skip_keys)
new_installation_path = self.node_configuration.initialize(passphrase=pending_config.passphrase,
wallet=pending_config.wallet,
encrypting=pending_config.signing,
tls=pending_config.tls,
no_registry=no_registry,
no_keys=pending_config.skip_keys)
if not pending_config.skip_keys:
click.secho("Generated new keys at {}".format(self.node_configuration.keyring_dir), fg='blue')
except NodeConfiguration.ConfigurationError as e:
@ -577,27 +578,28 @@ def stake(config,
start_period=start_period,
end_period=end_period))
if not click.confirm("Is this correct?"):
# field = click.prompt("Which stake field do you want to edit?")
raise NotImplementedError
# Initialize the staged stake
config.miner_agent.deposit_tokens(amount=value, lock_periods=duration, sender_address=address)
proc_params = ['run_ursula']
processProtocol = UrsulaProcessProtocol(command=proc_params)
ursula_proc = reactor.spawnProcess(processProtocol, "nucypher-cli", proc_params)
# TODO: Ursula Process management
# if not click.confirm("Is this correct?"):
# # field = click.prompt("Which stake field do you want to edit?")
# raise NotImplementedError
#
# # Initialize the staged stake
# config.miner_agent.deposit_tokens(amount=value, lock_periods=duration, sender_address=address)
#
# proc_params = ['run_ursula']
# processProtocol = UrsulaProcessProtocol(command=proc_params, checksum_address=checksum_address)
# ursula_proc = reactor.spawnProcess(processProtocol, "nucypher-cli", proc_params)
raise NotImplementedError
elif action == 'resume':
"""Reconnect and resume an existing live stake"""
proc_params = ['run_ursula']
processProtocol = UrsulaProcessProtocol(command=proc_params)
ursula_proc = reactor.spawnProcess(processProtocol, "nucypher-cli", proc_params)
# proc_params = ['run_ursula']
# processProtocol = UrsulaProcessProtocol(command=proc_params, checksum_address=checksum_address)
# ursula_proc = reactor.spawnProcess(processProtocol, "nucypher-cli", proc_params)
raise NotImplementedError
elif action == 'confirm-activity':
"""Manually confirm activity for the active period"""
stakes = config.miner_agent.get_all_stakes(miner_address=address)
if len(stakes) == 0:
raise RuntimeError("There are no active stakes for {}".format(address))
@ -650,7 +652,7 @@ def stake(config,
@cli.command()
@click.option('--geth', help="Simulate with geth", is_flag=True)
@click.option('--geth', help="Simulate with geth dev-mode", is_flag=True)
@click.option('--pyevm', help="Simulate with PyEVM", is_flag=True)
@click.option('--nodes', help="The number of nodes to simulate", type=click.INT, default=10)
@click.argument('action')
@ -941,12 +943,10 @@ def deploy(config,
__deployer_init_args.update({dependant: __deployment_agents[dependant]})
if upgradeable:
def __collect_secret_hash():
secret = click.prompt("Enter secret hash for {}".format(__contract_name), hide_input=True, confirmation_prompt=True)
secret_hash = hashlib.sha256(secret)
__deployer_init_args.update({'secret_hash': secret_hash})
return secret
__collect_secret_hash()
secret = click.prompt("Enter deployment secret for {}".format(__contract_name),
hide_input=True, confirmation_prompt=True)
secret_hash = hashlib.sha256(secret)
__deployer_init_args.update({'secret_hash': secret_hash})
__deployer = deployer_class(**__deployer_init_args)
@ -1011,7 +1011,7 @@ def deploy(config,
if not force and click.confirm("Save transaction hashes to JSON file?"):
file = click.prompt("Enter output filepath", type=click.File(mode='w')) # TODO
file.write(json.dumps(__deployment_transactions))
file.__write(json.dumps(__deployment_transactions))
click.secho("Successfully wrote transaction hashes file to {}".format(file.path), fg='green')
else:
@ -1168,12 +1168,12 @@ def ursula(config,
config.operating_mode = "federated" if ursula_config.federated_only else "decentralized"
click.secho("Running in {} mode".format(config.operating_mode), fg='blue')
if additional_nodes: # Secondary override
ursula_config.read_known_nodes(known_metadata_dir=additional_nodes)
click.secho("Loaded additional known nodes", color='blue')
# ursula_config.read_known_nodes(known_metadata_dir=additional_nodes)
# if additional_nodes: # Secondary override
# click.secho("Loaded additional known nodes", color='blue')
quantity_known_nodes = len(ursula_config.known_nodes)
if quantity_known_nodes:
if quantity_known_nodes > 0:
click.secho("Loaded {} known nodes from storages".format(quantity_known_nodes, fg='blue'))
else:
click.secho("WARNING: No seed nodes available", fg='red', bold=True)