Merge branch 'master' into build_method_test_pools

Author: OlufemiAdeOlusile

cardano_node_tests/cluster_scripts/testnets/start-cluster

@@ -7,6 +7,11 @@ TESTNET_DIR="${1:?"Testnet dir needed"}"
 SCRIPT_DIR="$(readlink -m "${0%/*}")"
 SOCKET_PATH="$(readlink -m "$CARDANO_NODE_SOCKET_PATH")"
 STATE_CLUSTER="${SOCKET_PATH%/*}"
+# Fail if PWD is STATE_CLUSTER, as STATE_CLUSTER will be deleted
+if [ "$PWD" = "$STATE_CLUSTER" ]; then
+  echo "Please run this script from outside of '$STATE_CLUSTER'" >&2
+  exit 1
+fi
 STATE_CLUSTER_NAME="${STATE_CLUSTER##*/}"
 SUPERVISORD_SOCKET_PATH="${STATE_CLUSTER}/supervisord.sock"
 START_CLUSTER_LOG="${STATE_CLUSTER}/start-cluster.log"
@@ -31,7 +36,10 @@ if [ -e "$SCRIPT_DIR/shell_env" ]; then
   source "$SCRIPT_DIR/shell_env"
 fi
 
-rm -rf "$STATE_CLUSTER"
+if ! ( rm -rf "$STATE_CLUSTER" || rm -rf "$STATE_CLUSTER"; ); then
+  echo "Could not remove existing '$STATE_CLUSTER'" >&2
+  exit 1
+fi
 mkdir -p "$STATE_CLUSTER"/{byron,shelley,webserver}
 cd "$STATE_CLUSTER/.."
 

cardano_node_tests/tests/common.py

@@ -454,6 +454,7 @@ def get_payment_addrs(
     caching_key: str = "",
     amount: int | None = None,
     min_amount: int | None = None,
+    key_gen_method: clusterlib_utils.KeyGenMethods = clusterlib_utils.KeyGenMethods.DIRECT,
 ) -> list[clusterlib.AddressRecord]:
     """Create new payment addresses."""
     if num < 1:
@@ -464,6 +465,7 @@ def _create_addrs() -> list[clusterlib.AddressRecord]:
         addrs = clusterlib_utils.create_payment_addr_records(
             *[f"{name_template}_fund_addr_{i}" for i in range(1, num + 1)],
             cluster_obj=cluster_obj,
+            key_gen_method=key_gen_method,
         )
         return addrs
 
@@ -486,6 +488,7 @@ def get_payment_addr(
     caching_key: str = "",
     amount: int | None = None,
     min_amount: int | None = None,
+    key_gen_method: clusterlib_utils.KeyGenMethods = clusterlib_utils.KeyGenMethods.DIRECT,
 ) -> clusterlib.AddressRecord:
     """Create a single new payment address."""
     return get_payment_addrs(
@@ -496,6 +499,7 @@ def get_payment_addr(
         caching_key=caching_key,
         amount=amount,
         min_amount=min_amount,
+        key_gen_method=key_gen_method,
     )[0]
 
 
@@ -508,6 +512,7 @@ def get_pool_users(
     caching_key: str = "",
     amount: int | None = None,
     min_amount: int | None = None,
+    payment_key_gen_method: clusterlib_utils.KeyGenMethods = clusterlib_utils.KeyGenMethods.DIRECT,
 ) -> list[clusterlib.PoolUser]:
     """Create new pool users."""
     if num < 1:
@@ -519,6 +524,7 @@ def _create_pool_users() -> list[clusterlib.PoolUser]:
             cluster_obj=cluster_obj,
             name_template=f"{name_template}_pool_user",
             no_of_addr=num,
+            payment_key_gen_method=payment_key_gen_method,
         )
         return users
 
@@ -541,6 +547,7 @@ def get_pool_user(
     caching_key: str = "",
     amount: int | None = None,
     min_amount: int | None = None,
+    payment_key_gen_method: clusterlib_utils.KeyGenMethods = clusterlib_utils.KeyGenMethods.DIRECT,
 ) -> clusterlib.PoolUser:
     """Create a single new pool user."""
     return get_pool_users(
@@ -551,6 +558,7 @@ def get_pool_user(
         caching_key=caching_key,
         amount=amount,
         min_amount=min_amount,
+        payment_key_gen_method=payment_key_gen_method,
     )[0]
 
 

cardano_node_tests/tests/test_tx_basic.py

@@ -89,6 +89,7 @@ def payment_addrs_disposable(
             cluster_manager=cluster_manager,
             cluster_obj=cluster,
             num=2,
+            key_gen_method=clusterlib_utils.KeyGenMethods.MNEMONIC,
         )
         return addrs