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

Return Path instead of str when generating filepath for output of events from status & stake cli commands.

pull/2786/head
derekpierre 2021-08-27 15:01:03 -04:00
parent bcd6071e3d
commit d6e6d22288
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nucypher/cli/commands/stake.py
View File

@ -132,7 +132,7 @@ from nucypher.cli.types import (
)
from nucypher.cli.utils import retrieve_events, setup_emitter
from nucypher.config.characters import StakeHolderConfiguration
from nucypher.utilities.events import generate_events_csv_filename
from nucypher.utilities.events import generate_events_csv_filepath
from nucypher.utilities.gas_strategies import construct_fixed_price_gas_strategy
option_csv = click.option('--csv',
@ -1175,7 +1175,7 @@ def events(general_config, staker_options, config_file, event_name, from_block,
if csv or csv_output_file:
if not csv_output_file:
# use default file path if not specified
csv_output_file = generate_events_csv_filename(contract_name=contract_name, event_name=event_name)
csv_output_file = generate_events_csv_filepath(contract_name=contract_name, event_name=event_name)
emitter.echo(f"Retrieving events from block {from_block} to {to_block}")
title = f" {contract_name} Events ".center(40, "-")

4
nucypher/cli/commands/status.py
View File

@ -50,7 +50,7 @@ from nucypher.cli.utils import (
parse_event_filters_into_argument_filters
)
from nucypher.config.constants import NUCYPHER_ENVVAR_PROVIDER_URI
from nucypher.utilities.events import generate_events_csv_filename
from nucypher.utilities.events import generate_events_csv_filepath
class RegistryOptions:
@ -227,7 +227,7 @@ def events(general_config, registry_options, contract_name, from_block, to_block
csv_output_file = csv_file
if csv or csv_output_file:
if not csv_output_file:
csv_output_file = generate_events_csv_filename(contract_name=agent.contract_name, event_name=name)
csv_output_file = generate_events_csv_filepath(contract_name=agent.contract_name, event_name=name)
retrieve_events(emitter=emitter,
agent=agent,

4
nucypher/utilities/events.py
View File

@ -26,8 +26,8 @@ from nucypher.blockchain.eth.agents import EthereumContractAgent
from nucypher.blockchain.eth.events import EventRecord
def generate_events_csv_filename(contract_name: str, event_name: str) -> str:
return f'{contract_name}_{event_name}_{maya.now().datetime().strftime("%Y-%m-%d_%H-%M-%S")}.csv'
def generate_events_csv_filepath(contract_name: str, event_name: str) -> Path:
return Path(f'{contract_name}_{event_name}_{maya.now().datetime().strftime("%Y-%m-%d_%H-%M-%S")}.csv')
def write_events_to_csv_file(csv_file: Path,