Create local handler to query config flag entries for the RevocRegEnt…

…ryHandler instead of passing it through node Signed-off-by: Christian Bormann <[email protected]>
RoCremer · Sep 30, 2022 · 2c3dcd8 · 2c3dcd8
1 parent 7bda70f
commit 2c3dcd8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/indy_node/server/node_bootstrap.py b/indy_node/server/node_bootstrap.py
@@ -226,7 +226,6 @@ def _register_config_req_handlers(self):
         self.node.read_manager.register_req_handler(get_taa_handler)
         self.node.read_manager.register_req_handler(get_frozen_ledgers_handler)
         self.node.read_manager.register_req_handler(get_flag_handler)
-        self.node.get_flag_handler = get_flag_handler
         # Register write handlers for a version
         self.node.write_manager.register_req_handler_with_version(auth_rule_handler_1_9_1,
                                                                   version="1.9.1")

diff --git a/indy_node/server/request_handlers/domain_req_handlers/revoc_reg_entry_handler.py b/indy_node/server/request_handlers/domain_req_handlers/revoc_reg_entry_handler.py
@@ -4,8 +4,9 @@
 from indy_common.authorize.auth_actions import AuthActionEdit, AuthActionAdd
 from indy_common.authorize.auth_request_validator import WriteRequestValidator
 from indy_common.config_util import getConfig
-from indy_common.constants import CONFIG_LEDGER_ID, FLAG_NAME_COMPAT_ORDERING, REVOC_REG_ENTRY, REVOC_REG_DEF_ID, VALUE, ISSUANCE_TYPE
+from indy_common.constants import FLAG_NAME_COMPAT_ORDERING, REVOC_REG_ENTRY, REVOC_REG_DEF_ID, VALUE, ISSUANCE_TYPE
 from indy_common.state.state_constants import MARKER_REVOC_REG_ENTRY, MARKER_REVOC_REG_ENTRY_ACCUM
+from indy_node.server.request_handlers.read_req_handlers.get_flag_handler import GetFlagRequestHandler
 from plenum.common.constants import DOMAIN_LEDGER_ID, TXN_TIME
 from plenum.common.exceptions import InvalidClientRequest
 from plenum.common.request import Request
@@ -28,13 +29,16 @@ def __init__(self, database_manager: DatabaseManager,
         super().__init__(database_manager, REVOC_REG_ENTRY, DOMAIN_LEDGER_ID)
         self.get_revocation_strategy = get_revocation_strategy
         self.write_req_validator = write_req_validator
+        # Default sorting behavior
         self.legacy_sort_config = getConfig().REV_STRATEGY_USE_COMPAT_ORDERING or False
-        self.node = node
+        # Create a local GetFlagRequestHandler to allow lookups for the config flag
+        get_flag_handler = GetFlagRequestHandler(node=node,
+                                                 database_manager=database_manager)
+        self.get_flag_handler = get_flag_handler
 
     def use_legacy_sort(self, txn) -> bool:
         txn_time = get_txn_time(txn)
-        get_flag_handler = self.node.get_flag_handler
-        state_raw = get_flag_handler.lookup_key(FLAG_NAME_COMPAT_ORDERING, timestamp=txn_time)
+        state_raw = self.get_flag_handler.lookup_key(FLAG_NAME_COMPAT_ORDERING, timestamp=txn_time)
         sort_state = FlagRequestHandler.get_state_value(state_raw)
         if sort_state and isinstance(sort_state, str):
             # only allow False as value, ignore otherwise

diff --git a/indy_node/test/request_handlers/test_revoc_reg_entry_handler.py b/indy_node/test/request_handlers/test_revoc_reg_entry_handler.py
@@ -37,9 +37,8 @@
 from plenum.server.node import Node
 
 @pytest.fixture(scope="function")
-def revoc_reg_entry_handler(db_manager_ts, write_auth_req_validator, get_flag_request_handler):
+def revoc_reg_entry_handler(db_manager_ts, write_auth_req_validator):
     node = Node.__new__(Node)
-    node.get_flag_handler = get_flag_request_handler
     return RevocRegEntryHandler(
         db_manager_ts, write_auth_req_validator, RevocRegDefHandler.get_revocation_strategy, node
     )