Merge branch 'master' into test_delegation_2

Author: OlufemiAdeOlusile

cardano_node_tests/cluster_management/cluster_getter.py

@@ -116,7 +116,7 @@ def instance_dir(self) -> pl.Path:
     def ports(self) -> cardonnay_local.InstancePorts:
         """Return port mappings for current cluster instance."""
         return cluster_nodes.get_cluster_type().cluster_scripts.get_instance_ports(
-            self.cluster_instance_num
+            instance_num=self.cluster_instance_num
         )
 
     def _create_startup_files_dir(self, instance_num: int) -> pl.Path:
@@ -935,7 +935,7 @@ def get_cluster_instance(  # noqa: C901
                     self.log(f"c{instance_num}: can run test '{cget_status.current_test}'")
                     # Set environment variables that are needed when respinning the cluster
                     # and running tests
-                    cluster_nodes.set_cluster_env(instance_num)
+                    cluster_nodes.set_cluster_env(instance_num=instance_num)
 
                     # Remove "prio" status file
                     if prio:

cardano_node_tests/cluster_management/netstat_tools.py

@@ -62,7 +62,9 @@ def _get_proc_cmdline(pid: int) -> str:
 
         return cmdline
 
-    port_nums = cluster_nodes.get_cluster_type().cluster_scripts.get_instance_ports(instance_num)
+    port_nums = cluster_nodes.get_cluster_type().cluster_scripts.get_instance_ports(
+        instance_num=instance_num
+    )
     port_strs = [
         # Add whitestpace to the end of each port number to avoid matching a port number that is a
         # prefix of another port number.

cardano_node_tests/testnet_cleanup.py

@@ -53,7 +53,7 @@ def main() -> int:
     if not socket_env:
         LOGGER.error("The `CARDANO_NODE_SOCKET_PATH` environment variable is not set.")
         return 1
-    if bool(args.address) ^ bool(args.skey_file):
+    if bool(args.address) != bool(args.skey_file):
         LOGGER.error(
             "Both address and skey file must be provided, or neither of them should be provided."
         )

cardano_node_tests/tests/delegation.py

@@ -97,7 +97,7 @@ def cluster_and_pool(
                 if pool_id in stake_pools:
                     return cluster_obj, pool_id
 
-        blocks_before = clusterlib_utils.get_blocks_before(cluster_obj)
+        blocks_before = clusterlib_utils.get_blocks_before(cluster_obj=cluster_obj)
         # Sort pools by how many blocks they produce
         pool_ids_s = sorted(blocks_before, key=blocks_before.get, reverse=True)  # type: ignore
         # Select a pool with reasonable margin

cardano_node_tests/tests/kes.py

@@ -82,7 +82,7 @@ def check_kes_period_info_result(  # noqa: C901
         KesScenarios.INVALID_COUNTERS,
     ):
         instance_ports = cluster_nodes.get_cluster_type().cluster_scripts.get_instance_ports(
-            cluster_nodes.get_instance_num()
+            instance_num=cluster_nodes.get_instance_num()
         )
         prometheus_port = instance_ports.node_ports[pool_num].prometheus
         response = http_client.get_session().get(

cardano_node_tests/tests/test_dbsync_config.py

@@ -73,26 +73,28 @@ def check_dbsync_state(
                 f"Invalid column condition format: {condition}"
             )
             column_condition = condition.value.split(":", 1)[1]
-            dbsync_utils.check_column_condition(table, column, column_condition)
+            dbsync_utils.check_column_condition(
+                table=table, column=column, condition=column_condition
+            )
         else:  # Table-level check
             assert isinstance(condition, TableCondition), (
                 f"Invalid table condition format: {condition}"
             )
             match condition:
                 case TableCondition.EMPTY:
-                    assert dbsync_utils.table_empty(key), (
+                    assert dbsync_utils.table_empty(table=key), (
                         f"Expected {key} to be empty, but it is not."
                     )
                 case TableCondition.NOT_EMPTY:
-                    assert not dbsync_utils.table_empty(key), (
+                    assert not dbsync_utils.table_empty(table=key), (
                         f"Expected {key} to have data, but it is empty."
                     )
                 case TableCondition.EXISTS:
-                    assert dbsync_utils.table_exists(key), (
+                    assert dbsync_utils.table_exists(table=key), (
                         f"Expected {key} to exist, but it does not."
                     )
                 case TableCondition.NOT_EXISTS:
-                    assert not dbsync_utils.table_exists(key), (
+                    assert not dbsync_utils.table_exists(table=key), (
                         f"Expected {key} to NOT exist, but it does."
                     )
                 case _:

cardano_node_tests/tests/test_kes.py

@@ -82,7 +82,7 @@ def cluster_kes(
 
 def _save_metrics(pool_num: int, temp_template: str) -> None:
     instance_ports = cluster_nodes.get_cluster_type().cluster_scripts.get_instance_ports(
-        cluster_nodes.get_instance_num()
+        instance_num=cluster_nodes.get_instance_num()
     )
     port = instance_ports.node_ports[pool_num].prometheus
 

cardano_node_tests/tests/test_metrics.py

@@ -110,7 +110,7 @@ def test_available_metrics(
         """Test that list of available metrics == list of expected metrics."""
         prometheus_port = (
             cluster_nodes.get_cluster_type()
-            .cluster_scripts.get_instance_ports(cluster_nodes.get_instance_num())
+            .cluster_scripts.get_instance_ports(instance_num=cluster_nodes.get_instance_num())
             .prometheus_pool1
         )
 
@@ -133,9 +133,9 @@ def test_available_metrics(
         """Test that available EKG metrics matches the expected schema."""
         ekg_port = (
             cluster_nodes.get_cluster_type()
-            .cluster_scripts.get_instance_ports(cluster_nodes.get_instance_num())
+            .cluster_scripts.get_instance_ports(instance_num=cluster_nodes.get_instance_num())
             .ekg_pool1
         )
 
         response = get_ekg_metrics(ekg_port)
-        model_ekg.Model.validate(response.json())
+        model_ekg.Model.model_validate(response.json())

cardano_node_tests/tests/test_pools.py

@@ -2627,7 +2627,7 @@ def pools(
             cluster_obj=cluster,
             name_template=f"{temp_template}_delegate_reward_addrs",
             src_address=pool_owners[0].payment.address,
-            use_build_cmd=True,
+            build_method=clusterlib_utils.BuildMethods.BUILD,
             tx_files=tx_files,
             deposit=deposit_address_amt,
         )

cardano_node_tests/tests/test_reconnect.py

@@ -242,7 +242,7 @@ def test_metrics_reconnect(
 
         prometheus_port = (
             cluster_nodes.get_cluster_type()
-            .cluster_scripts.get_instance_ports(cluster_nodes.get_instance_num())
+            .cluster_scripts.get_instance_ports(instance_num=cluster_nodes.get_instance_num())
             .prometheus_pool2
         )