chore: Improve HathorSettings imports

hathor/daa.py

@@ -19,18 +19,20 @@
 NOTE: This module could use a better name.
 """
 
+from __future__ import annotations
+
 from enum import IntFlag
 from math import log
 from typing import TYPE_CHECKING, Callable, ClassVar, Optional
 
 from structlog import get_logger
 
-from hathor.conf.settings import HathorSettings
 from hathor.profiler import get_cpu_profiler
 from hathor.types import VertexId
 from hathor.util import iwindows
 
 if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
     from hathor.transaction import Block, Transaction
 
 logger = get_logger()

hathor/indexes/manager.py

@@ -12,14 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import operator
 from abc import ABC, abstractmethod
 from functools import reduce
 from typing import TYPE_CHECKING, Iterator, Optional
 
 from structlog import get_logger
 
-from hathor.conf.settings import HathorSettings
 from hathor.indexes.address_index import AddressIndex
 from hathor.indexes.base_index import BaseIndex
 from hathor.indexes.height_index import HeightIndex
@@ -33,6 +34,7 @@
 from hathor.util import tx_progress
 
 if TYPE_CHECKING:  # pragma: no cover
+    from hathor.conf.settings import HathorSettings
     from hathor.pubsub import PubSubManager
     from hathor.storage import RocksDBStorage
     from hathor.transaction.storage import TransactionStorage

hathor/reward_lock/reward_lock.py

@@ -12,13 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING, Iterator, Optional
 
-from hathor.conf.settings import HathorSettings
 from hathor.transaction import Block
 from hathor.util import not_none
 
 if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
     from hathor.transaction.storage.vertex_storage_protocol import VertexStorageProtocol
     from hathor.transaction.transaction import RewardLockedInfo, Transaction
 

hathor/transaction/storage/__init__.py

@@ -14,14 +14,10 @@
 
 from hathor.transaction.storage.cache_storage import TransactionCacheStorage
 from hathor.transaction.storage.memory_storage import TransactionMemoryStorage
+from hathor.transaction.storage.rocksdb_storage import TransactionRocksDBStorage
 from hathor.transaction.storage.transaction_storage import TransactionStorage
 from hathor.transaction.storage.vertex_storage_protocol import VertexStorageProtocol
 
-try:
-    from hathor.transaction.storage.rocksdb_storage import TransactionRocksDBStorage
-except ImportError:
-    pass
-
 __all__ = [
     'TransactionStorage',
     'TransactionMemoryStorage',

hathor/transaction/storage/cache_storage.py

@@ -13,19 +13,21 @@
 # limitations under the License.
 
 from collections import OrderedDict
-from typing import Any, Iterator, Optional
+from typing import TYPE_CHECKING, Any, Iterator, Optional
 
 from twisted.internet import threads
 from typing_extensions import override
 
-from hathor.conf.settings import HathorSettings
 from hathor.indexes import IndexesManager
 from hathor.reactor import ReactorProtocol as Reactor
 from hathor.transaction import BaseTransaction
 from hathor.transaction.storage.migrations import MigrationState
 from hathor.transaction.storage.transaction_storage import BaseTransactionStorage
 from hathor.transaction.storage.tx_allow_scope import TxAllowScope
 
+if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
+
 
 class TransactionCacheStorage(BaseTransactionStorage):
     """Caching storage to be used 'on top' of other storages.
@@ -41,7 +43,7 @@ def __init__(
         interval: int = 5,
         capacity: int = 10000,
         *,
-        settings: HathorSettings,
+        settings: 'HathorSettings',
         indexes: Optional[IndexesManager],
         _clone_if_needed: bool = False,
     ) -> None:

hathor/transaction/storage/memory_storage.py

@@ -12,18 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Iterator, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Iterator, Optional, TypeVar
 
 from typing_extensions import override
 
-from hathor.conf.settings import HathorSettings
 from hathor.indexes import IndexesManager
 from hathor.transaction import BaseTransaction
 from hathor.transaction.storage.exceptions import TransactionDoesNotExist
 from hathor.transaction.storage.migrations import MigrationState
 from hathor.transaction.storage.transaction_storage import BaseTransactionStorage
 from hathor.transaction.transaction_metadata import TransactionMetadata
 
+if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
+
 _Clonable = TypeVar('_Clonable', BaseTransaction, TransactionMetadata)
 
 
@@ -32,7 +34,7 @@ def __init__(
         self,
         indexes: Optional[IndexesManager] = None,
         *,
-        settings: HathorSettings,
+        settings: 'HathorSettings',
         _clone_if_needed: bool = False,
     ) -> None:
         """

hathor/transaction/storage/rocksdb_storage.py

@@ -17,7 +17,6 @@
 from structlog import get_logger
 from typing_extensions import override
 
-from hathor.conf.settings import HathorSettings
 from hathor.indexes import IndexesManager
 from hathor.storage import RocksDBStorage
 from hathor.transaction.static_metadata import VertexStaticMetadata
@@ -29,6 +28,7 @@
 if TYPE_CHECKING:
     import rocksdb
 
+    from hathor.conf.settings import HathorSettings
     from hathor.transaction import BaseTransaction
 
 logger = get_logger()
@@ -52,7 +52,7 @@ def __init__(
         rocksdb_storage: RocksDBStorage,
         indexes: Optional[IndexesManager] = None,
         *,
-        settings: HathorSettings,
+        settings: 'HathorSettings',
         vertex_parser: VertexParser,
     ) -> None:
         self._cf_tx = rocksdb_storage.get_or_create_column_family(_CF_NAME_TX)

hathor/transaction/storage/transaction_storage.py

@@ -12,18 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import hashlib
 from abc import ABC, abstractmethod, abstractproperty
 from collections import deque
 from contextlib import AbstractContextManager
 from threading import Lock
-from typing import Any, Iterator, NamedTuple, Optional, cast
+from typing import TYPE_CHECKING, Any, Iterator, NamedTuple, Optional, cast
 from weakref import WeakValueDictionary
 
 from intervaltree.interval import Interval
 from structlog import get_logger
 
-from hathor.conf.settings import HathorSettings
 from hathor.execution_manager import ExecutionManager
 from hathor.indexes import IndexesManager
 from hathor.indexes.height_index import HeightInfo
@@ -50,6 +51,9 @@
 from hathor.types import VertexId
 from hathor.verification.transaction_verifier import TransactionVerifier
 
+if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
+
 cpu = get_cpu_profiler()
 
 # these are the timestamp values to be used when resetting them, 1 is used for the node instead of 0, so it can be

hathor/transaction/vertex_parser.py

@@ -17,9 +17,8 @@
 from struct import error as StructError
 from typing import TYPE_CHECKING
 
-from hathor.conf.settings import HathorSettings
-
 if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
     from hathor.transaction import BaseTransaction
     from hathor.transaction.storage import TransactionStorage
 

hathor/verification/transaction_verifier.py

@@ -12,7 +12,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from hathor.conf.settings import HathorSettings
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from hathor.daa import DifficultyAdjustmentAlgorithm
 from hathor.profiler import get_cpu_profiler
 from hathor.reward_lock import get_spent_reward_locked_info
@@ -39,6 +42,9 @@
 from hathor.transaction.util import get_deposit_amount, get_withdraw_amount
 from hathor.types import TokenUid, VertexId
 
+if TYPE_CHECKING:
+    from hathor.conf.settings import HathorSettings
+
 cpu = get_cpu_profiler()