review changes

Author: glevco

hathor/builder/builder.py

@@ -177,7 +177,6 @@ def build(self) -> BuildArtifacts:
         feature_service = self._get_or_create_feature_service()
         bit_signaling_service = self._get_or_create_bit_signaling_service()
         verification_service = self._get_or_create_verification_service()
-        feature_storage = self._get_or_create_feature_storage()
         daa = self._get_or_create_daa()
         cpu_mining_service = self._get_or_create_cpu_mining_service()
 
@@ -216,7 +215,6 @@ def build(self) -> BuildArtifacts:
             environment_info=get_environment_info(self._cmdline, peer_id.id),
             feature_service=feature_service,
             bit_signaling_service=bit_signaling_service,
-            feature_storage=feature_storage,
             verification_service=verification_service,
             cpu_mining_service=cpu_mining_service,
             **kwargs
@@ -464,12 +462,14 @@ def _get_or_create_bit_signaling_service(self) -> BitSignalingService:
             settings = self._get_or_create_settings()
             tx_storage = self._get_or_create_tx_storage()
             feature_service = self._get_or_create_feature_service()
+            feature_storage = self._get_or_create_feature_storage()
             self._bit_signaling_service = BitSignalingService(
                 feature_settings=settings.FEATURE_ACTIVATION,
                 feature_service=feature_service,
                 tx_storage=tx_storage,
                 support_features=self._support_features,
                 not_support_features=self._not_support_features,
+                feature_storage=feature_storage,
             )
 
         return self._bit_signaling_service

hathor/builder/cli_builder.py

@@ -214,7 +214,8 @@ def create_manager(self, reactor: Reactor) -> HathorManager:
             feature_service=self.feature_service,
             tx_storage=tx_storage,
             support_features=self._args.signal_support,
-            not_support_features=self._args.signal_not_support
+            not_support_features=self._args.signal_not_support,
+            feature_storage=feature_storage,
         )
 
         test_mode = TestMode.DISABLED
@@ -271,7 +272,6 @@ def create_manager(self, reactor: Reactor) -> HathorManager:
             bit_signaling_service=bit_signaling_service,
             verification_service=verification_service,
             cpu_mining_service=cpu_mining_service,
-            feature_storage=feature_storage,
         )
 
         p2p_manager.set_manager(self.manager)

hathor/cli/reset_feature_settings.py

@@ -16,9 +16,6 @@
 
 from structlog import get_logger
 
-from hathor.conf.get_settings import get_settings
-from hathor.feature_activation.storage.feature_activation_storage import FeatureActivationStorage
-
 logger = get_logger()
 
 
@@ -32,6 +29,8 @@ def create_parser() -> ArgumentParser:
 
 
 def execute(args: Namespace) -> None:
+    from hathor.conf.get_settings import get_settings
+    from hathor.feature_activation.storage.feature_activation_storage import FeatureActivationStorage
     from hathor.storage import RocksDBStorage
 
     assert args.data is not None, '--data is required'

hathor/feature_activation/bit_signaling_service.py

@@ -19,6 +19,7 @@
 from hathor.feature_activation.model.criteria import Criteria
 from hathor.feature_activation.model.feature_state import FeatureState
 from hathor.feature_activation.settings import Settings as FeatureSettings
+from hathor.feature_activation.storage.feature_activation_storage import FeatureActivationStorage
 from hathor.transaction import Block
 from hathor.transaction.storage import TransactionStorage
 
@@ -32,7 +33,8 @@ class BitSignalingService:
         '_feature_service',
         '_tx_storage',
         '_support_features',
-        '_not_support_features'
+        '_not_support_features',
+        '_feature_storage',
     )
 
     def __init__(
@@ -42,14 +44,16 @@ def __init__(
         feature_service: FeatureService,
         tx_storage: TransactionStorage,
         support_features: set[Feature],
-        not_support_features: set[Feature]
+        not_support_features: set[Feature],
+        feature_storage: FeatureActivationStorage | None,
     ) -> None:
         self._log = logger.new()
         self._feature_settings = feature_settings
         self._feature_service = feature_service
         self._tx_storage = tx_storage
         self._support_features = support_features
         self._not_support_features = not_support_features
+        self._feature_storage = feature_storage
 
         self._validate_support_intersection()
 
@@ -58,6 +62,9 @@ def start(self) -> None:
         Log information related to bit signaling. Must be called after the storage is ready and migrations have
         been applied.
         """
+        if self._feature_storage:
+            self._feature_storage.validate_settings()
+
         best_block = self._tx_storage.get_best_block()
 
         self._warn_non_signaling_features(best_block)

hathor/feature_activation/storage/feature_activation_storage.py

@@ -35,15 +35,11 @@ def __init__(self, *, settings: HathorSettings, rocksdb_storage: RocksDBStorage)
         self._db = rocksdb_storage.get_db()
         self._cf_meta = rocksdb_storage.get_or_create_column_family(_CF_NAME_META)
 
-    def start(self) -> None:
-        """Start the storage."""
-        self._validate_settings()
-
     def reset_settings(self) -> None:
         """Reset feature settings from the database."""
         self._db.delete((self._cf_meta, _KEY_SETTINGS))
 
-    def _validate_settings(self) -> None:
+    def validate_settings(self) -> None:
         """Validate new feature settings against the previous configuration from the database."""
         new_settings = self._settings.FEATURE_ACTIVATION
         db_settings_bytes: bytes | None = self._db.get((self._cf_meta, _KEY_SETTINGS))

hathor/manager.py

@@ -43,7 +43,6 @@
 from hathor.feature_activation.bit_signaling_service import BitSignalingService
 from hathor.feature_activation.feature import Feature
 from hathor.feature_activation.feature_service import FeatureService
-from hathor.feature_activation.storage.feature_activation_storage import FeatureActivationStorage
 from hathor.mining import BlockTemplate, BlockTemplates
 from hathor.mining.cpu_mining_service import CpuMiningService
 from hathor.p2p.manager import ConnectionsManager
@@ -100,7 +99,6 @@ def __init__(self,
                  event_manager: EventManager,
                  feature_service: FeatureService,
                  bit_signaling_service: BitSignalingService,
-                 feature_storage: FeatureActivationStorage | None,
                  verification_service: VerificationService,
                  cpu_mining_service: CpuMiningService,
                  network: str,
@@ -180,7 +178,6 @@ def __init__(self,
 
         self._feature_service = feature_service
         self._bit_signaling_service = bit_signaling_service
-        self._feature_storage = feature_storage
         self.verification_service = verification_service
         self.cpu_mining_service = cpu_mining_service
 
@@ -283,9 +280,6 @@ def start(self) -> None:
         self._event_manager.load_started()
         self.pow_thread_pool.start()
 
-        if self._feature_storage:
-            self._feature_storage.start()
-
         # Disable get transaction lock when initializing components
         self.tx_storage.disable_lock()
         # Open scope for initialization.

tests/feature_activation/test_bit_signaling_service.py

@@ -173,7 +173,8 @@ def _test_generate_signal_bits(
         feature_service=feature_service,
         tx_storage=Mock(),
         support_features=support_features,
-        not_support_features=not_support_features
+        not_support_features=not_support_features,
+        feature_storage=Mock(),
     )
 
     return service.generate_signal_bits(block=Mock())
@@ -216,6 +217,7 @@ def test_support_intersection_validation(
             tx_storage=Mock(),
             support_features=support_features,
             not_support_features=not_support_features,
+            feature_storage=Mock(),
         )
 
     message = str(e.value)
@@ -270,6 +272,7 @@ def get_bits_description_mock(block):
         tx_storage=tx_storage,
         support_features=support_features,
         not_support_features=not_support_features,
+        feature_storage=Mock(),
     )
     logger_mock = Mock()
     service._log = logger_mock