refactor: move get settings [part 3] (#770)

Author: glevco

hathor/cli/run_node.py

@@ -266,8 +266,8 @@ def check_unsafe_arguments(self) -> None:
                 '',
             ]
 
-            from hathor.conf import HathorSettings
-            settings = HathorSettings()
+            from hathor.conf.get_settings import get_settings
+            settings = get_settings()
 
             if self._args.unsafe_mode != settings.NETWORK_NAME:
                 message.extend([

hathor/p2p/resources/mining_info.py

@@ -16,13 +16,11 @@
 
 from hathor.api_util import Resource, set_cors
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.daa import get_mined_tokens
 from hathor.difficulty import Weight
 from hathor.util import json_dumpb
 
-settings = HathorSettings()
-
 
 @register_resource
 class MiningInfoResource(Resource):
@@ -33,6 +31,7 @@ class MiningInfoResource(Resource):
     isLeaf = True
 
     def __init__(self, manager):
+        self._settings = get_settings()
         self.manager = manager
 
     def render_GET(self, request):
@@ -48,7 +47,7 @@ def render_GET(self, request):
 
         # We can use any address.
         burn_address = bytes.fromhex(
-            settings.P2PKH_VERSION_BYTE.hex() + 'acbfb94571417423c1ed66f706730c4aea516ac5762cccb8'
+            self._settings.P2PKH_VERSION_BYTE.hex() + 'acbfb94571417423c1ed66f706730c4aea516ac5762cccb8'
         )
         block = self.manager.generate_mining_block(address=burn_address)
 

hathor/p2p/resources/status.py

@@ -17,12 +17,10 @@
 import hathor
 from hathor.api_util import Resource, set_cors
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.p2p.utils import to_serializable_best_blockchain
 from hathor.util import json_dumpb
 
-settings = HathorSettings()
-
 
 @register_resource
 class StatusResource(Resource):
@@ -34,6 +32,7 @@ class StatusResource(Resource):
     isLeaf = True
 
     def __init__(self, manager):
+        self._settings = get_settings()
         self.manager = manager
 
     def render_GET(self, request):
@@ -94,7 +93,7 @@ def render_GET(self, request):
             best_block_tips.append({'hash': tx.hash_hex, 'height': meta.height})
 
         best_block = self.manager.tx_storage.get_best_block()
-        raw_best_blockchain = self.manager.tx_storage.get_n_height_tips(settings.DEFAULT_BEST_BLOCKCHAIN_BLOCKS)
+        raw_best_blockchain = self.manager.tx_storage.get_n_height_tips(self._settings.DEFAULT_BEST_BLOCKCHAIN_BLOCKS)
         best_blockchain = to_serializable_best_blockchain(raw_best_blockchain)
 
         data = {

hathor/p2p/states/hello.py

@@ -17,7 +17,7 @@
 from structlog import get_logger
 
 import hathor
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.exception import HathorError
 from hathor.p2p.messages import ProtocolMessages
 from hathor.p2p.states.base import BaseState
@@ -30,12 +30,11 @@
 
 logger = get_logger()
 
-settings = HathorSettings()
-
 
 class HelloState(BaseState):
     def __init__(self, protocol: 'HathorProtocol') -> None:
         super().__init__(protocol)
+        self._settings = get_settings()
         self.log = logger.new(**protocol.get_logger_context())
         self.cmd_map.update({
             ProtocolMessages.HELLO: self.handle_hello,
@@ -103,7 +102,7 @@ def handle_hello(self, payload: str) -> None:
             protocol.send_error_and_close_connection('Invalid payload.')
             return
 
-        if settings.ENABLE_PEER_WHITELIST and settings.CAPABILITY_WHITELIST not in data['capabilities']:
+        if self._settings.ENABLE_PEER_WHITELIST and self._settings.CAPABILITY_WHITELIST not in data['capabilities']:
             # If peer is not sending whitelist capability we must close the connection
             protocol.send_error_and_close_connection('Must have whitelist capability.')
             return
@@ -142,7 +141,7 @@ def handle_hello(self, payload: str) -> None:
             return
 
         dt = data['timestamp'] - protocol.node.reactor.seconds()
-        if abs(dt) > settings.MAX_FUTURE_TIMESTAMP_ALLOWED / 2:
+        if abs(dt) > self._settings.MAX_FUTURE_TIMESTAMP_ALLOWED / 2:
             protocol.send_error_and_close_connection('Nodes timestamps too far apart.')
             return
 
@@ -173,6 +172,7 @@ def handle_hello(self, payload: str) -> None:
 
 def _parse_sync_versions(hello_data: dict[str, Any]) -> set[SyncVersion]:
     """Versions that are not recognized will not be included."""
+    settings = get_settings()
     if settings.CAPABILITY_SYNC_VERSION in hello_data['capabilities']:
         if 'sync_versions' not in hello_data:
             raise HathorError('protocol error, expected sync_versions field')

hathor/p2p/states/ready.py

@@ -18,7 +18,7 @@
 from structlog import get_logger
 from twisted.internet.task import LoopingCall
 
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.indexes.height_index import HeightInfo
 from hathor.p2p.messages import ProtocolMessages
 from hathor.p2p.peer_id import PeerId
@@ -33,12 +33,11 @@
 
 logger = get_logger()
 
-settings = HathorSettings()
-
 
 class ReadyState(BaseState):
     def __init__(self, protocol: 'HathorProtocol') -> None:
         super().__init__(protocol)
+        self._settings = get_settings()
 
         self.log = logger.new(**self.protocol.get_logger_context())
 
@@ -79,7 +78,7 @@ def __init__(self, protocol: 'HathorProtocol') -> None:
 
         # if the peer has the GET-BEST-BLOCKCHAIN capability
         common_capabilities = protocol.capabilities & set(protocol.node.capabilities)
-        if (settings.CAPABILITY_GET_BEST_BLOCKCHAIN in common_capabilities):
+        if (self._settings.CAPABILITY_GET_BEST_BLOCKCHAIN in common_capabilities):
             # set the loop to get the best blockchain from the peer
             self.lc_get_best_blockchain = LoopingCall(self.send_get_best_blockchain)
             self.lc_get_best_blockchain.clock = self.reactor
@@ -110,7 +109,7 @@ def on_enter(self) -> None:
         self.send_get_peers()
 
         if self.lc_get_best_blockchain is not None:
-            self.lc_get_best_blockchain.start(settings.BEST_BLOCKCHAIN_INTERVAL, now=False)
+            self.lc_get_best_blockchain.start(self._settings.BEST_BLOCKCHAIN_INTERVAL, now=False)
 
         self.sync_agent.start()
 
@@ -209,11 +208,12 @@ def handle_pong(self, payload: str) -> None:
         self.ping_start_time = None
         self.log.debug('rtt updated', rtt=self.ping_rtt, min_rtt=self.ping_min_rtt)
 
-    def send_get_best_blockchain(self, n_blocks: int = settings.DEFAULT_BEST_BLOCKCHAIN_BLOCKS) -> None:
+    def send_get_best_blockchain(self, n_blocks: Optional[int] = None) -> None:
         """ Send a GET-BEST-BLOCKCHAIN command, requesting a list of the latest
         N blocks from the best blockchain.
         """
-        self.send_message(ProtocolMessages.GET_BEST_BLOCKCHAIN, str(n_blocks))
+        actual_n_blocks: int = n_blocks if n_blocks is not None else self._settings.DEFAULT_BEST_BLOCKCHAIN_BLOCKS
+        self.send_message(ProtocolMessages.GET_BEST_BLOCKCHAIN, str(actual_n_blocks))
 
     def handle_get_best_blockchain(self, payload: str) -> None:
         """ Executed when a GET-BEST-BLOCKCHAIN command is received.
@@ -228,9 +228,9 @@ def handle_get_best_blockchain(self, payload: str) -> None:
             )
             return
 
-        if not (0 < n_blocks <= settings.MAX_BEST_BLOCKCHAIN_BLOCKS):
+        if not (0 < n_blocks <= self._settings.MAX_BEST_BLOCKCHAIN_BLOCKS):
             self.protocol.send_error_and_close_connection(
-                f'N out of bounds. Valid range: [1, {settings.MAX_BEST_BLOCKCHAIN_BLOCKS}].'
+                f'N out of bounds. Valid range: [1, {self._settings.MAX_BEST_BLOCKCHAIN_BLOCKS}].'
             )
             return
 

hathor/transaction/resources/dashboard.py

@@ -14,11 +14,9 @@
 
 from hathor.api_util import Resource, get_args, get_missing_params_msg, parse_args, parse_int, set_cors
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.util import json_dumpb
 
-settings = HathorSettings()
-
 ARGS = ['block', 'tx']
 
 
@@ -33,6 +31,7 @@ class DashboardTransactionResource(Resource):
 
     def __init__(self, manager):
         # Important to have the manager so we can know the tx_storage
+        self._settings = get_settings()
         self.manager = manager
 
     def render_GET(self, request):
@@ -69,8 +68,8 @@ def render_GET(self, request):
             })
 
         # Restrict counts
-        block_count = min(block_count, settings.MAX_DASHBOARD_COUNT)
-        tx_count = min(tx_count, settings.MAX_DASHBOARD_COUNT)
+        block_count = min(block_count, self._settings.MAX_DASHBOARD_COUNT)
+        tx_count = min(tx_count, self._settings.MAX_DASHBOARD_COUNT)
 
         transactions, _ = self.manager.tx_storage.get_newest_txs(count=tx_count)
         serialized_tx = [tx.to_json_extended() for tx in transactions]

hathor/transaction/resources/mempool.py

@@ -18,12 +18,10 @@
 
 from hathor.api_util import Resource, get_args, parse_args, set_cors
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.transaction import Transaction
 from hathor.util import json_dumpb
 
-settings = HathorSettings()
-
 if TYPE_CHECKING:
     from twisted.web.http import Request
 
@@ -46,6 +44,7 @@ class MempoolResource(Resource):
 
     def __init__(self, manager: 'HathorManager'):
         # Important to have the manager so we can know the tx_storage
+        self._settings = get_settings()
         self.manager = manager
 
     def render_GET(self, request: 'Request') -> bytes:
@@ -82,7 +81,7 @@ def render_GET(self, request: 'Request') -> bytes:
             sorted(list(self._get_from_index(index_source)), key=lambda tx: tx.timestamp),
         )
         # Only return up to settings.MEMPOOL_API_TX_LIMIT txs per call (default: 100)
-        data = {'success': True, 'transactions': list(islice(tx_ids, settings.MEMPOOL_API_TX_LIMIT))}
+        data = {'success': True, 'transactions': list(islice(tx_ids, self._settings.MEMPOOL_API_TX_LIMIT))}
         return json_dumpb(data)
 
     def _get_from_index(self, index_source: IndexSource) -> Iterator[Transaction]:

hathor/transaction/resources/push_tx.py

@@ -21,7 +21,7 @@
 
 from hathor.api_util import Resource, get_args, parse_args, render_options, set_cors
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.exception import InvalidNewTransaction
 from hathor.transaction import Transaction
 from hathor.transaction.base_transaction import tx_or_block_from_bytes
@@ -31,7 +31,6 @@
 if TYPE_CHECKING:
     from hathor.manager import HathorManager
 
-settings = HathorSettings()
 logger = get_logger()
 
 ARGS = ['hex_tx']
@@ -47,11 +46,12 @@ class PushTxResource(Resource):
 
     def __init__(self, manager: 'HathorManager', max_output_script_size: Optional[int] = None,
                  allow_non_standard_script: bool = False) -> None:
+        self._settings = get_settings()
         self.log = logger.new()
         # Important to have the manager so we can know the tx_storage
         self.manager = manager
         self.max_output_script_size: int = (
-            settings.PUSHTX_MAX_OUTPUT_SCRIPT_SIZE
+            self._settings.PUSHTX_MAX_OUTPUT_SCRIPT_SIZE
             if max_output_script_size is None else
             max_output_script_size
         )

hathor/transaction/resources/transaction.py

@@ -24,13 +24,11 @@
     validate_tx_hash,
 )
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.transaction.base_transaction import BaseTransaction, TxVersion
 from hathor.transaction.token_creation_tx import TokenCreationTransaction
 from hathor.util import json_dumpb
 
-settings = HathorSettings()
-
 GET_LIST_ARGS = ['count', 'type']
 
 
@@ -51,6 +49,7 @@ def get_tx_extra_data(tx: BaseTransaction, *, detail_tokens: bool = True) -> dic
     assert tx.storage is not None
     assert tx.storage.indexes is not None
 
+    settings = get_settings()
     serialized = tx.to_json(decode_script=True)
     serialized['raw'] = tx.get_struct().hex()
     serialized['nonce'] = str(tx.nonce)
@@ -206,6 +205,7 @@ def get_list_tx(self, request):
             'timestamp': int, the timestamp reference we are in the pagination
             'page': 'previous' or 'next', to indicate if the user wants after or before the hash reference
         """
+        settings = get_settings()
         raw_args = get_args(request)
         parsed = parse_args(raw_args, GET_LIST_ARGS)
         if not parsed['success']:

hathor/transaction/resources/utxo_search.py

@@ -24,7 +24,7 @@
     set_cors,
 )
 from hathor.cli.openapi_files.register import register_resource
-from hathor.conf import HathorSettings
+from hathor.conf.get_settings import get_settings
 from hathor.crypto.util import decode_address
 from hathor.util import json_dumpb
 from hathor.wallet.exceptions import InvalidAddress
@@ -35,9 +35,6 @@
     from hathor.manager import HathorManager
 
 
-settings = HathorSettings()
-
-
 @register_resource
 class UtxoSearchResource(Resource):
     """ Implements a web server API to return a list of UTXOs that fit a given search criteria.
@@ -48,6 +45,7 @@ class UtxoSearchResource(Resource):
 
     def __init__(self, manager: 'HathorManager'):
         # Important to have the manager so we can know the tx_storage
+        self._settings = get_settings()
         self.manager = manager
 
     def render_GET(self, request: 'Request') -> bytes:
@@ -86,7 +84,7 @@ def render_GET(self, request: 'Request') -> bytes:
         # token_uid parameter must be a valid hash
         try:
             token_uid = bytes.fromhex(args['token_uid'])
-            if token_uid != settings.HATHOR_TOKEN_UID and len(token_uid) != 32:
+            if token_uid != self._settings.HATHOR_TOKEN_UID and len(token_uid) != 32:
                 raise ValueError('not a valid hash length')
         except ValueError as e:
             return json_dumpb({