diff --git a/moonworm/cli.py b/moonworm/cli.py index 35be310..f763db2 100644 --- a/moonworm/cli.py +++ b/moonworm/cli.py @@ -124,10 +124,10 @@ def handle_watch(args: argparse.Namespace) -> None: raise ValueError("Please specify --network") network = Network.__members__[args.network] - from .crawler.networks import yield_db_session_ctx from .crawler.moonstream_ethereum_state_provider import ( MoonstreamEthereumStateProvider, ) + from .crawler.networks import yield_db_session_ctx state_provider = MoonstreamEthereumStateProvider(web3, network) diff --git a/moonworm/crawler/moonstream_ethereum_state_provider.py b/moonworm/crawler/moonstream_ethereum_state_provider.py index 59fd907..ddc5be4 100644 --- a/moonworm/crawler/moonstream_ethereum_state_provider.py +++ b/moonworm/crawler/moonstream_ethereum_state_provider.py @@ -3,23 +3,20 @@ from typing import Any, Dict, List, Optional, Union from eth_typing.evm import ChecksumAddress from hexbytes.main import HexBytes - -from .networks import yield_db_session_ctx -from .networks import ( - EthereumLabel, - EthereumTransaction, - PolygonLabel, - PolygonTransaction, - XDaiTransaction, -) - - from sqlalchemy.orm import Session from sqlalchemy.sql.base import NO_ARG from web3 import Web3 from .ethereum_state_provider import EthereumStateProvider -from .networks import MODELS +from .networks import ( + MODELS, + EthereumLabel, + EthereumTransaction, + PolygonLabel, + PolygonTransaction, + XDaiTransaction, + yield_db_session_ctx, +) from .utils import Network logging.basicConfig(level=logging.INFO) diff --git a/moonworm/crawler/networks.py b/moonworm/crawler/networks.py index 95b6662..50f993e 100644 --- a/moonworm/crawler/networks.py +++ b/moonworm/crawler/networks.py @@ -1,6 +1,7 @@ from typing import Dict try: + from moonstreamdb.db import yield_db_session_ctx from moonstreamdb.models import ( Base, EthereumBlock, @@ -13,7 +14,6 @@ try: XDaiLabel, XDaiTransaction, ) - from moonstreamdb.db import yield_db_session_ctx except ImportError: print("this feature requires moonstreamdb which is not installed") print("to enable, run: `pip install moonworm[moonstream]`")