Fix circular imports

Because:
- They were causing errors in the cli
pull/3159/head
Owen Campbell 2023-06-27 13:36:37 +01:00
parent ccc54bcbe0
commit 9d8ed60190
No known key found for this signature in database
GPG Key ID: 628F79BCBE9C2B73
3 changed files with 13 additions and 12 deletions

View File

@ -1,19 +1,20 @@
import eth_utils
import functools
import inspect
from datetime import datetime
from typing import Callable, Optional, TypeVar, Union
import eth_utils
from constant_sorrow.constants import (
CONTRACT_ATTRIBUTE,
CONTRACT_CALL,
NO_BLOCKCHAIN_CONNECTION,
TRANSACTION,
UNKNOWN_CONTRACT_INTERFACE,
NO_BLOCKCHAIN_CONNECTION
)
from datetime import datetime
from typing import Callable, Optional, Union
from web3.types import TxReceipt, Wei
from nucypher.types import ContractReturnValue
from nucypher.utilities.logging import Logger
ContractInterfaces = Union[
@ -22,6 +23,9 @@ ContractInterfaces = Union[
CONTRACT_ATTRIBUTE,
UNKNOWN_CONTRACT_INTERFACE
]
ContractReturnValue = TypeVar(
"ContractReturnValue", bound=Union[TxReceipt, Wei, int, str, bool]
)
__VERIFIED_ADDRESSES = set()

View File

@ -6,7 +6,7 @@ from twisted.internet import threads
from web3.contract.contract import ContractEvent
from web3.datastructures import AttributeDict
from nucypher.blockchain.eth.actors import Ritualist
from nucypher.blockchain.eth import actors
from nucypher.policy.conditions.utils import camel_case_to_snake
from nucypher.utilities.events import EventScanner, JSONifiedState
from nucypher.utilities.logging import Logger
@ -67,7 +67,7 @@ class ActiveRitualTracker:
def __init__(
self,
ritualist: Ritualist,
ritualist: "actors.Ritualist",
persistent: bool = False, # TODO: use persistent storage?
):
self.log = Logger("RitualTracker")

View File

@ -1,7 +1,7 @@
from typing import NamedTuple, NewType, TypeVar, Union
from typing import NamedTuple, NewType, TypeVar
from eth_typing.evm import ChecksumAddress
from web3.types import TxReceipt, Wei
from web3.types import Wei
from nucypher.blockchain.eth import agents
@ -10,9 +10,6 @@ NuNits = NewType("NuNits", ERC20UNits)
TuNits = NewType("TuNits", ERC20UNits)
Agent = TypeVar("Agent", bound="agents.EthereumContractAgent")
ContractReturnValue = TypeVar(
"ContractReturnValue", bound=Union[TxReceipt, Wei, int, str, bool]
)
class StakingProviderInfo(NamedTuple):