update scripts usage of taco domains; conventionally use str() on domains usages

pull/3322/head
Kieran Prasch 2023-10-29 22:44:04 +01:00 committed by KPrasch
parent c87d4f5d1d
commit f4caacc4b1
5 changed files with 9 additions and 8 deletions

View File

@ -77,7 +77,7 @@ TAPIR = TACoDomain(
DEFAULT_DOMAIN: TACoDomain = MAINNET
SUPPORTED_DOMAINS: Dict[str, TACoDomain] = {domain.name: domain for domain in (MAINNET, LYNX, TAPIR)}
SUPPORTED_DOMAINS: Dict[str, TACoDomain] = {str(domain): domain for domain in (MAINNET, LYNX, TAPIR)}
@ -86,6 +86,6 @@ def get_domain(d: Any) -> TACoDomain:
if not isinstance(d, str):
raise TypeError(f"domain must be a string, not {type(d)}")
for name, domain in SUPPORTED_DOMAINS.items():
if name == d == domain.name:
if name == d == str(domain):
return domain
raise UnrecognizedTacoDomain(f"{d} is not a recognized domain.")

View File

@ -45,8 +45,8 @@ emitter = StdoutEmitter(verbosity=2)
"--domain",
"domain",
help="TACo domain",
type=click.Choice(domains.SUPPORTED_DOMAINS),
default=domains.LYNX.name,
type=click.Choice(list(domains.SUPPORTED_DOMAINS)),
default=str(domains.LYNX),
)
@click.option(
"--eth-endpoint",
@ -67,6 +67,7 @@ def nucypher_agents(
eth_endpoint,
polygon_endpoint,
):
domain = domains.get_domain(str(domain))
registry = ContractRegistry.from_latest_publication(domain=domain)
emitter.echo(f"NOTICE: Connecting to {domain} domain", color="yellow")

View File

@ -46,8 +46,8 @@ def get_transacting_power(signer: Signer):
"--domain",
"domain",
help="TACo Domain",
type=click.Choice([domains.TAPIR.name, domains.LYNX.name]),
default=domains.LYNX.name,
type=click.Choice([str(domains.TAPIR), str(domains.LYNX)]),
default=str(domains.LYNX),
)
@click.option(
"--eth-endpoint",

View File

@ -54,7 +54,7 @@ except KeyError:
raise RuntimeError(message)
# Alice Configuration
TACO_DOMAIN: str = LYNX.name # mainnet
TACO_DOMAIN: str = str(LYNX) # mainnet
DEFAULT_SEEDNODE_URIS: List[str] = [
*TEACHER_NODES[TACO_DOMAIN],
]

View File

@ -22,7 +22,7 @@ def mock_registry_sources(mocker, _domains: List[TACoDomain] = None):
_supported_domains = mocker.patch.dict(
'nucypher.blockchain.eth.domains.SUPPORTED_DOMAINS',
{domain.name: domain for domain in _domains},
{str(domain): domain for domain in _domains},
)
mocker.patch.object(MockRegistrySource, "ALLOWED_DOMAINS", list(map(str, _domains)))