From 17f7c69535d8d6d5d9407c98020478cf047a98f1 Mon Sep 17 00:00:00 2001 From: Martin Kourim Date: Wed, 2 Oct 2024 12:07:45 +0200 Subject: [PATCH] feat: randomly select faucet address for funding --- cardano_node_tests/tests/common.py | 2 +- cardano_node_tests/tests/delegation.py | 2 +- .../tests/test_addr_registration.py | 2 +- cardano_node_tests/tests/test_blocks.py | 4 +-- .../tests/test_chain_transactions.py | 2 +- cardano_node_tests/tests/test_cli.py | 2 +- cardano_node_tests/tests/test_dbsync.py | 2 +- cardano_node_tests/tests/test_delegation.py | 8 +++--- .../tests/test_env_network_id.py | 2 +- cardano_node_tests/tests/test_governance.py | 2 +- cardano_node_tests/tests/test_mir_certs.py | 2 +- .../tests/test_native_tokens.py | 12 ++++----- cardano_node_tests/tests/test_node_upgrade.py | 4 +-- cardano_node_tests/tests/test_pools.py | 26 +++++++++---------- cardano_node_tests/tests/test_reconnect.py | 2 +- cardano_node_tests/tests/test_rollback.py | 2 +- cardano_node_tests/tests/test_scripts.py | 18 ++++++------- cardano_node_tests/tests/test_socket_path.py | 2 +- .../tests/test_staking_no_rewards.py | 10 +++---- .../tests/test_staking_rewards.py | 8 +++--- cardano_node_tests/tests/test_tx_basic.py | 14 +++++----- cardano_node_tests/tests/test_tx_fees.py | 4 +-- .../tests/test_tx_many_utxos.py | 2 +- cardano_node_tests/tests/test_tx_mempool.py | 2 +- cardano_node_tests/tests/test_tx_metadata.py | 4 +-- cardano_node_tests/tests/test_tx_negative.py | 2 +- .../tests/test_tx_unbalanced.py | 2 +- .../tests/test_update_proposals.py | 4 +-- .../tests/tests_conway/conway_common.py | 2 +- .../tests/tests_conway/test_committee.py | 2 +- .../tests/tests_conway/test_drep.py | 6 ++--- .../tests/tests_conway/test_guardrails.py | 2 +- .../tests/tests_conway/test_pparam_update.py | 2 +- .../tests_conway/test_treasury_donation.py | 4 +-- .../test_update_plutusv2_builtins.py | 2 +- .../tests/tests_plutus/test_delegation.py | 2 +- .../tests/tests_plutus/test_lobster.py | 2 +- .../tests/tests_plutus/test_mint_build.py | 2 +- .../tests_plutus/test_mint_negative_build.py | 2 +- .../tests_plutus/test_mint_negative_raw.py | 2 +- .../tests/tests_plutus/test_mint_raw.py | 2 +- .../tests/tests_plutus/test_spend_build.py | 4 +-- .../tests_plutus/test_spend_compat_build.py | 2 +- .../tests_plutus/test_spend_compat_raw.py | 2 +- .../tests_plutus/test_spend_datum_build.py | 2 +- .../tests_plutus/test_spend_datum_raw.py | 2 +- .../tests_plutus/test_spend_negative_build.py | 2 +- .../tests_plutus/test_spend_negative_raw.py | 4 +-- .../tests/tests_plutus/test_spend_raw.py | 4 +-- .../tests/tests_plutus_v2/test_mint_build.py | 2 +- .../test_mint_negative_build.py | 2 +- .../tests_plutus_v2/test_mint_negative_raw.py | 2 +- .../tests/tests_plutus_v2/test_mint_raw.py | 2 +- .../test_mint_secp256k1_build.py | 2 +- .../test_mint_secp256k1_raw.py | 2 +- .../tests/tests_plutus_v2/test_spend_build.py | 2 +- .../test_spend_collateral_build.py | 2 +- .../test_spend_collateral_raw.py | 2 +- .../test_spend_compat_build.py | 2 +- .../tests_plutus_v2/test_spend_compat_raw.py | 2 +- .../tests_plutus_v2/test_spend_datum_build.py | 2 +- .../tests_plutus_v2/test_spend_datum_raw.py | 2 +- .../tests/tests_plutus_v2/test_spend_raw.py | 2 +- .../test_spend_ref_inputs_build.py | 4 +-- .../test_spend_ref_inputs_raw.py | 2 +- .../test_spend_ref_scripts_build.py | 2 +- .../test_spend_ref_scripts_raw.py | 2 +- .../test_spend_secp256k1_build.py | 2 +- .../test_spend_secp256k1_raw.py | 2 +- cardano_node_tests/utils/governance_setup.py | 2 +- 70 files changed, 123 insertions(+), 123 deletions(-) diff --git a/cardano_node_tests/tests/common.py b/cardano_node_tests/tests/common.py index 700399269..e60b1d6c7 100644 --- a/cardano_node_tests/tests/common.py +++ b/cardano_node_tests/tests/common.py @@ -241,7 +241,7 @@ def detect_fork( tx_raw_output = clusterlib_utils.fund_from_faucet( payment_rec, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=2_000_000, ) assert tx_raw_output diff --git a/cardano_node_tests/tests/delegation.py b/cardano_node_tests/tests/delegation.py index e83dc20c0..e6ed6a260 100644 --- a/cardano_node_tests/tests/delegation.py +++ b/cardano_node_tests/tests/delegation.py @@ -152,7 +152,7 @@ def delegate_stake_addr( clusterlib_utils.fund_from_faucet( pool_user.payment, cluster_obj=cluster_obj, - faucet_data=addrs_data["user1"], + all_faucets=addrs_data, amount=amount, ) diff --git a/cardano_node_tests/tests/test_addr_registration.py b/cardano_node_tests/tests/test_addr_registration.py index ea25e0f3b..c918038d7 100644 --- a/cardano_node_tests/tests/test_addr_registration.py +++ b/cardano_node_tests/tests/test_addr_registration.py @@ -41,7 +41,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users diff --git a/cardano_node_tests/tests/test_blocks.py b/cardano_node_tests/tests/test_blocks.py index b97e2722b..ec04f285c 100644 --- a/cardano_node_tests/tests/test_blocks.py +++ b/cardano_node_tests/tests/test_blocks.py @@ -210,7 +210,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -404,7 +404,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_chain_transactions.py b/cardano_node_tests/tests/test_chain_transactions.py index d75b9ea9f..85a8511ac 100644 --- a/cardano_node_tests/tests/test_chain_transactions.py +++ b/cardano_node_tests/tests/test_chain_transactions.py @@ -36,7 +36,7 @@ def get_payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=amount, ) diff --git a/cardano_node_tests/tests/test_cli.py b/cardano_node_tests/tests/test_cli.py index e79f16c98..57a195c83 100644 --- a/cardano_node_tests/tests/test_cli.py +++ b/cardano_node_tests/tests/test_cli.py @@ -721,7 +721,7 @@ def test_pretty_utxo( clusterlib_utils.fund_from_faucet( payment_addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=amount1 + amount2 + 10_000_000, ) diff --git a/cardano_node_tests/tests/test_dbsync.py b/cardano_node_tests/tests/test_dbsync.py index be702113e..206f5d38e 100644 --- a/cardano_node_tests/tests/test_dbsync.py +++ b/cardano_node_tests/tests/test_dbsync.py @@ -314,7 +314,7 @@ def test_reconnect_dbsync( clusterlib_utils.fund_from_faucet( payment_addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=10_000_000, ) diff --git a/cardano_node_tests/tests/test_delegation.py b/cardano_node_tests/tests/test_delegation.py index 3e4317ac5..77c85c95f 100644 --- a/cardano_node_tests/tests/test_delegation.py +++ b/cardano_node_tests/tests/test_delegation.py @@ -80,7 +80,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users @@ -127,7 +127,7 @@ def pool_users_cluster_and_pool( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users @@ -302,7 +302,7 @@ def _get_pool_users( clusterlib_utils.fund_from_faucet( *pool_users, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) # Step: Delegate the stake addresses to 2 different pools @@ -431,7 +431,7 @@ def test_deregister_delegated( clusterlib_utils.fund_from_faucet( *payment_addr_recs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) pool_user = clusterlib.PoolUser(payment=payment_addr_recs[1], stake=stake_addr_rec) diff --git a/cardano_node_tests/tests/test_env_network_id.py b/cardano_node_tests/tests/test_env_network_id.py index e3fce7f8a..82486a4b6 100644 --- a/cardano_node_tests/tests/test_env_network_id.py +++ b/cardano_node_tests/tests/test_env_network_id.py @@ -117,7 +117,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=100_000_000, ) return addrs diff --git a/cardano_node_tests/tests/test_governance.py b/cardano_node_tests/tests/test_governance.py index cd19902cf..2c8d53450 100644 --- a/cardano_node_tests/tests/test_governance.py +++ b/cardano_node_tests/tests/test_governance.py @@ -62,7 +62,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=amount, ) diff --git a/cardano_node_tests/tests/test_mir_certs.py b/cardano_node_tests/tests/test_mir_certs.py index a125ec4bd..a9af7636c 100644 --- a/cardano_node_tests/tests/test_mir_certs.py +++ b/cardano_node_tests/tests/test_mir_certs.py @@ -80,7 +80,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( *created_users, cluster_obj=cluster_pots, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users diff --git a/cardano_node_tests/tests/test_native_tokens.py b/cardano_node_tests/tests/test_native_tokens.py index fd74afa07..bc6335cea 100644 --- a/cardano_node_tests/tests/test_native_tokens.py +++ b/cardano_node_tests/tests/test_native_tokens.py @@ -90,7 +90,7 @@ def issuers_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=9_000_000, ) @@ -773,7 +773,7 @@ def _mint_tokens() -> clusterlib.TxRawOutput: clusterlib_utils.fund_from_faucet( token_mint_addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=300_000_000, ) @@ -799,7 +799,7 @@ def _mint_tokens() -> clusterlib.TxRawOutput: clusterlib_utils.fund_from_faucet( token_mint_addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=40_000_000, ) @@ -918,7 +918,7 @@ def _mint_tokens() -> clusterlib.TxRawOutput: clusterlib_utils.fund_from_faucet( token_mint_addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=300_000_000, ) @@ -944,7 +944,7 @@ def _mint_tokens() -> clusterlib.TxRawOutput: clusterlib_utils.fund_from_faucet( token_mint_addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=40_000_000, ) @@ -1662,7 +1662,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_node_upgrade.py b/cardano_node_tests/tests/test_node_upgrade.py index bc6d57856..5ba380ca5 100644 --- a/cardano_node_tests/tests/test_node_upgrade.py +++ b/cardano_node_tests/tests/test_node_upgrade.py @@ -47,7 +47,7 @@ def payment_addr_locked( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr @@ -71,7 +71,7 @@ def payment_addrs_disposable( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_pools.py b/cardano_node_tests/tests/test_pools.py index 111697f14..8e5c98b28 100644 --- a/cardano_node_tests/tests/test_pools.py +++ b/cardano_node_tests/tests/test_pools.py @@ -667,7 +667,7 @@ def test_stake_pool_metadata( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -748,7 +748,7 @@ def test_stake_pool_not_avail_metadata( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -818,7 +818,7 @@ def test_create_stake_pool( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -883,7 +883,7 @@ def test_deregister_stake_pool( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -1024,7 +1024,7 @@ def test_reregister_stake_pool( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_500_000_000, ) @@ -1185,7 +1185,7 @@ def test_cancel_stake_pool_deregistration( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_500_000_000, ) @@ -1350,7 +1350,7 @@ def test_update_stake_pool_metadata( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000 * no_of_addr, ) @@ -1469,7 +1469,7 @@ def test_update_stake_pool_parameters( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000 * no_of_addr, ) @@ -1570,7 +1570,7 @@ def test_sign_in_multiple_stages( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -1707,7 +1707,7 @@ def test_pool_registration_deregistration( clusterlib_utils.fund_from_faucet( pool_owner.payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -1813,7 +1813,7 @@ def pool_owners_pbt( clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -1896,7 +1896,7 @@ def _subtest(pool_cost: int) -> None: clusterlib_utils.fund_from_faucet( pool_owners[0].payment, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, ) @@ -1940,7 +1940,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=600_000_000, ) diff --git a/cardano_node_tests/tests/test_reconnect.py b/cardano_node_tests/tests/test_reconnect.py index 9d26e25fa..54d6d21d2 100644 --- a/cardano_node_tests/tests/test_reconnect.py +++ b/cardano_node_tests/tests/test_reconnect.py @@ -63,7 +63,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_rollback.py b/cardano_node_tests/tests/test_rollback.py index d13644b04..4bf69ce20 100644 --- a/cardano_node_tests/tests/test_rollback.py +++ b/cardano_node_tests/tests/test_rollback.py @@ -72,7 +72,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_scripts.py b/cardano_node_tests/tests/test_scripts.py index 895d969b6..7c08fb4fe 100644 --- a/cardano_node_tests/tests/test_scripts.py +++ b/cardano_node_tests/tests/test_scripts.py @@ -159,7 +159,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=10_000_000_000, ) @@ -705,7 +705,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -949,7 +949,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -1615,7 +1615,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -1849,7 +1849,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -2049,7 +2049,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -2158,7 +2158,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=100_000_000, ) @@ -2432,7 +2432,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -2859,7 +2859,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_socket_path.py b/cardano_node_tests/tests/test_socket_path.py index 1b91c70b5..3d5e0a8c5 100644 --- a/cardano_node_tests/tests/test_socket_path.py +++ b/cardano_node_tests/tests/test_socket_path.py @@ -109,7 +109,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=100_000_000, ) return addrs diff --git a/cardano_node_tests/tests/test_staking_no_rewards.py b/cardano_node_tests/tests/test_staking_no_rewards.py index e7ce199c4..b2af51389 100644 --- a/cardano_node_tests/tests/test_staking_no_rewards.py +++ b/cardano_node_tests/tests/test_staking_no_rewards.py @@ -159,7 +159,7 @@ def test_no_reward_unmet_pledge1( clusterlib_utils.fund_from_faucet( pool_owner, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) @@ -319,7 +319,7 @@ def test_no_reward_unmet_pledge2( clusterlib_utils.fund_from_faucet( delegation_out.pool_user, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) @@ -501,7 +501,7 @@ def test_no_reward_deregistered_stake_addr( clusterlib_utils.fund_from_faucet( pool_owner, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) @@ -697,7 +697,7 @@ def test_no_reward_deregistered_reward_addr( clusterlib_utils.fund_from_faucet( pool_reward, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) @@ -864,7 +864,7 @@ def test_deregister_reward_addr_retire_pool( clusterlib_utils.fund_from_faucet( pool_owner, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) diff --git a/cardano_node_tests/tests/test_staking_rewards.py b/cardano_node_tests/tests/test_staking_rewards.py index 2836e472b..86e4d21a9 100644 --- a/cardano_node_tests/tests/test_staking_rewards.py +++ b/cardano_node_tests/tests/test_staking_rewards.py @@ -369,7 +369,7 @@ def test_reward_amount( # noqa: C901 clusterlib_utils.fund_from_faucet( *payment_addr_recs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) pool_user = clusterlib.PoolUser(payment=payment_addr_recs[1], stake=stake_addr_rec) @@ -675,7 +675,7 @@ def test_reward_addr_delegation( # noqa: C901 clusterlib_utils.fund_from_faucet( pool_owner, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) @@ -1081,7 +1081,7 @@ def test_decreasing_reward_transferred_funds( clusterlib_utils.fund_from_faucet( dst_addr_record, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) # transfer all funds from payment address back to faucet, so no funds are staked @@ -1200,7 +1200,7 @@ def test_2_pools_same_reward_addr( # noqa: C901 clusterlib_utils.fund_from_faucet( pool2_owner, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=900_000_000, force=True, ) diff --git a/cardano_node_tests/tests/test_tx_basic.py b/cardano_node_tests/tests/test_tx_basic.py index bfaad59d4..e7357206f 100644 --- a/cardano_node_tests/tests/test_tx_basic.py +++ b/cardano_node_tests/tests/test_tx_basic.py @@ -53,7 +53,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -81,7 +81,7 @@ def byron_addrs( clusterlib_utils.fund_from_faucet( *new_byron_addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return new_byron_addrs @@ -104,7 +104,7 @@ def payment_addrs_disposable( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -126,7 +126,7 @@ def payment_addrs_no_change( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -770,7 +770,7 @@ def test_no_txout( clusterlib_utils.fund_from_faucet( src_record, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=2_000_000, ) @@ -1207,7 +1207,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=90_000_000_000, ) @@ -1508,7 +1508,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_tx_fees.py b/cardano_node_tests/tests/test_tx_fees.py index 4b71602ff..ec2053e9e 100644 --- a/cardano_node_tests/tests/test_tx_fees.py +++ b/cardano_node_tests/tests/test_tx_fees.py @@ -63,7 +63,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs @@ -219,7 +219,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( *created_users[:10], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users diff --git a/cardano_node_tests/tests/test_tx_many_utxos.py b/cardano_node_tests/tests/test_tx_many_utxos.py index b80b45fbf..8e529f718 100644 --- a/cardano_node_tests/tests/test_tx_many_utxos.py +++ b/cardano_node_tests/tests/test_tx_many_utxos.py @@ -52,7 +52,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=800_000_000_000, ) diff --git a/cardano_node_tests/tests/test_tx_mempool.py b/cardano_node_tests/tests/test_tx_mempool.py index 711869dad..5b7d170fd 100644 --- a/cardano_node_tests/tests/test_tx_mempool.py +++ b/cardano_node_tests/tests/test_tx_mempool.py @@ -37,7 +37,7 @@ def payment_addrs_locked( clusterlib_utils.fund_from_faucet( *addrs, cluster_obj=cluster_singleton, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_tx_metadata.py b/cardano_node_tests/tests/test_tx_metadata.py index d14c78687..d59cab968 100644 --- a/cardano_node_tests/tests/test_tx_metadata.py +++ b/cardano_node_tests/tests/test_tx_metadata.py @@ -51,7 +51,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr @@ -607,7 +607,7 @@ def test_tx_metadata_no_txout( clusterlib_utils.fund_from_faucet( src_record, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=2_000_000, ) diff --git a/cardano_node_tests/tests/test_tx_negative.py b/cardano_node_tests/tests/test_tx_negative.py index c2acd68ca..4003762cc 100644 --- a/cardano_node_tests/tests/test_tx_negative.py +++ b/cardano_node_tests/tests/test_tx_negative.py @@ -89,7 +89,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( *created_users, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return created_users diff --git a/cardano_node_tests/tests/test_tx_unbalanced.py b/cardano_node_tests/tests/test_tx_unbalanced.py index fd28ebaeb..21a5cea7c 100644 --- a/cardano_node_tests/tests/test_tx_unbalanced.py +++ b/cardano_node_tests/tests/test_tx_unbalanced.py @@ -86,7 +86,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addrs diff --git a/cardano_node_tests/tests/test_update_proposals.py b/cardano_node_tests/tests/test_update_proposals.py index 3e166d7c2..150d4192d 100644 --- a/cardano_node_tests/tests/test_update_proposals.py +++ b/cardano_node_tests/tests/test_update_proposals.py @@ -64,7 +64,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr @@ -390,7 +390,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr diff --git a/cardano_node_tests/tests/tests_conway/conway_common.py b/cardano_node_tests/tests/tests_conway/conway_common.py index d650d9c05..a87bb1a90 100644 --- a/cardano_node_tests/tests/tests_conway/conway_common.py +++ b/cardano_node_tests/tests/tests_conway/conway_common.py @@ -143,7 +143,7 @@ def _create_user() -> clusterlib.PoolUser: clusterlib_utils.fund_from_faucet( pool_user.payment, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=fund_amount, ) diff --git a/cardano_node_tests/tests/tests_conway/test_committee.py b/cardano_node_tests/tests/tests_conway/test_committee.py index f772d6f21..b9dd2a715 100644 --- a/cardano_node_tests/tests/tests_conway/test_committee.py +++ b/cardano_node_tests/tests/tests_conway/test_committee.py @@ -56,7 +56,7 @@ def payment_addr_comm( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr diff --git a/cardano_node_tests/tests/tests_conway/test_drep.py b/cardano_node_tests/tests/tests_conway/test_drep.py index 498e3f027..b4fb2b671 100644 --- a/cardano_node_tests/tests/tests_conway/test_drep.py +++ b/cardano_node_tests/tests/tests_conway/test_drep.py @@ -76,7 +76,7 @@ def get_payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr @@ -104,7 +104,7 @@ def get_pool_user( clusterlib_utils.fund_from_faucet( pool_user.payment, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return pool_user @@ -1876,7 +1876,7 @@ def _check_records() -> tp.List[blockers.GH]: clusterlib_utils.fund_from_faucet( *drep_users, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, # Add a lot of funds so no action can be ratified without the new DReps amount=10_000_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_conway/test_guardrails.py b/cardano_node_tests/tests/tests_conway/test_guardrails.py index 8795f1e91..0e8c75a9a 100644 --- a/cardano_node_tests/tests/tests_conway/test_guardrails.py +++ b/cardano_node_tests/tests/tests_conway/test_guardrails.py @@ -97,7 +97,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=10_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_conway/test_pparam_update.py b/cardano_node_tests/tests/tests_conway/test_pparam_update.py index c6c6cb03d..505474bcd 100644 --- a/cardano_node_tests/tests/tests_conway/test_pparam_update.py +++ b/cardano_node_tests/tests/tests_conway/test_pparam_update.py @@ -1399,7 +1399,7 @@ def payment_addr( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr diff --git a/cardano_node_tests/tests/tests_conway/test_treasury_donation.py b/cardano_node_tests/tests/tests_conway/test_treasury_donation.py index 43d0c9fcd..df9cf837f 100644 --- a/cardano_node_tests/tests/tests_conway/test_treasury_donation.py +++ b/cardano_node_tests/tests/tests_conway/test_treasury_donation.py @@ -50,7 +50,7 @@ def payment_addr_treasury( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster_treasury, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr @@ -73,7 +73,7 @@ def payment_addr_singleton( clusterlib_utils.fund_from_faucet( addr, cluster_obj=cluster_singleton, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) return addr diff --git a/cardano_node_tests/tests/tests_conway/test_update_plutusv2_builtins.py b/cardano_node_tests/tests/tests_conway/test_update_plutusv2_builtins.py index fac94c5f2..d66387dc1 100644 --- a/cardano_node_tests/tests/tests_conway/test_update_plutusv2_builtins.py +++ b/cardano_node_tests/tests/tests_conway/test_update_plutusv2_builtins.py @@ -62,7 +62,7 @@ def payment_addrs_lg( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_delegation.py b/cardano_node_tests/tests/tests_plutus/test_delegation.py index 194729c10..dcdd87da7 100644 --- a/cardano_node_tests/tests/tests_plutus/test_delegation.py +++ b/cardano_node_tests/tests/tests_plutus/test_delegation.py @@ -103,7 +103,7 @@ def pool_user( clusterlib_utils.fund_from_faucet( payment_addr_rec, cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=18_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_lobster.py b/cardano_node_tests/tests/tests_plutus/test_lobster.py index c00dca28b..c906b5e1e 100644 --- a/cardano_node_tests/tests/tests_plutus/test_lobster.py +++ b/cardano_node_tests/tests/tests_plutus/test_lobster.py @@ -51,7 +51,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_mint_build.py b/cardano_node_tests/tests/tests_plutus/test_mint_build.py index 25b66d36c..589a87b39 100644 --- a/cardano_node_tests/tests/tests_plutus/test_mint_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_mint_build.py @@ -50,7 +50,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_mint_negative_build.py b/cardano_node_tests/tests/tests_plutus/test_mint_negative_build.py index c6a74680d..e8b235726 100644 --- a/cardano_node_tests/tests/tests_plutus/test_mint_negative_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_mint_negative_build.py @@ -51,7 +51,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_mint_negative_raw.py b/cardano_node_tests/tests/tests_plutus/test_mint_negative_raw.py index 51ebdecc8..2471f9f85 100644 --- a/cardano_node_tests/tests/tests_plutus/test_mint_negative_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_mint_negative_raw.py @@ -43,7 +43,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_mint_raw.py b/cardano_node_tests/tests/tests_plutus/test_mint_raw.py index 76dcd80db..1090315cc 100644 --- a/cardano_node_tests/tests/tests_plutus/test_mint_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_mint_raw.py @@ -46,7 +46,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_build.py b/cardano_node_tests/tests/tests_plutus/test_spend_build.py index 8b338d137..274894ddd 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_build.py @@ -45,7 +45,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) @@ -69,7 +69,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_compat_build.py b/cardano_node_tests/tests/tests_plutus/test_spend_compat_build.py index dc0ba4f97..c19bec9ed 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_compat_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_compat_build.py @@ -39,7 +39,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_compat_raw.py b/cardano_node_tests/tests/tests_plutus/test_spend_compat_raw.py index 33a0ef81b..8b72a49bf 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_compat_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_compat_raw.py @@ -38,7 +38,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_datum_build.py b/cardano_node_tests/tests/tests_plutus/test_spend_datum_build.py index 5d177b688..1d742cd06 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_datum_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_datum_build.py @@ -46,7 +46,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_datum_raw.py b/cardano_node_tests/tests/tests_plutus/test_spend_datum_raw.py index db1180149..71fa300a6 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_datum_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_datum_raw.py @@ -43,7 +43,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_negative_build.py b/cardano_node_tests/tests/tests_plutus/test_spend_negative_build.py index 96a2a37d7..d5a777ae8 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_negative_build.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_negative_build.py @@ -44,7 +44,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_negative_raw.py b/cardano_node_tests/tests/tests_plutus/test_spend_negative_raw.py index 0d68b104b..c4d2cf309 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_negative_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_negative_raw.py @@ -50,7 +50,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) @@ -720,7 +720,7 @@ def _fund_script_guessing_game( clusterlib_utils.fund_from_faucet( payment_addrs[0], cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus/test_spend_raw.py b/cardano_node_tests/tests/tests_plutus/test_spend_raw.py index 4ca3b5e61..2cb665647 100644 --- a/cardano_node_tests/tests/tests_plutus/test_spend_raw.py +++ b/cardano_node_tests/tests/tests_plutus/test_spend_raw.py @@ -49,7 +49,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) @@ -73,7 +73,7 @@ def pool_users( clusterlib_utils.fund_from_faucet( created_users[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_build.py index e412d18ea..4ea8035a5 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_build.py @@ -42,7 +42,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_build.py index 6d52947fb..9c6fc2a16 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_build.py @@ -39,7 +39,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_raw.py index 8fbd41e93..db090d7ad 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_negative_raw.py @@ -38,7 +38,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_raw.py index d12379c64..4a277844a 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_raw.py @@ -42,7 +42,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_build.py index a4985d76d..bd0c290cb 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_build.py @@ -40,7 +40,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_raw.py index 1858ca742..580ffd52f 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_mint_secp256k1_raw.py @@ -40,7 +40,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_build.py index 9fabe6dee..b3662257d 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_build.py @@ -42,7 +42,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_build.py index 2dbae82a8..d56ed7afc 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_build.py @@ -42,7 +42,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_raw.py index 2669c4556..b9befa582 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_collateral_raw.py @@ -41,7 +41,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_build.py index a66bede53..7d4b84d9f 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_build.py @@ -40,7 +40,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_raw.py index e8d4aa595..a8fa52bf3 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_compat_raw.py @@ -39,7 +39,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_build.py index 6f6eb6656..a90548726 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_build.py @@ -44,7 +44,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_raw.py index 142af6827..3199ce5cb 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_datum_raw.py @@ -43,7 +43,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_raw.py index 32090046d..0a2afdc2e 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_raw.py @@ -41,7 +41,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_build.py index 1fac4baae..b4938a2fe 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_build.py @@ -43,7 +43,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) @@ -290,7 +290,7 @@ def test_use_same_reference_input_multiple_times( clusterlib_utils.fund_from_faucet( payment_addrs[1], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, ) # create the reference input diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_raw.py index a6993f8fe..323ef8650 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_inputs_raw.py @@ -42,7 +42,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_build.py index f4b50b272..f2f373380 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_build.py @@ -40,7 +40,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_raw.py index 7434bb7be..b81d8910d 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_ref_scripts_raw.py @@ -40,7 +40,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_build.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_build.py index 9739c6ca3..7c8f93fd0 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_build.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_build.py @@ -43,7 +43,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=1_000_000_000, ) diff --git a/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_raw.py b/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_raw.py index 33d6f3533..663317295 100644 --- a/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_raw.py +++ b/cardano_node_tests/tests/tests_plutus_v2/test_spend_secp256k1_raw.py @@ -39,7 +39,7 @@ def payment_addrs( clusterlib_utils.fund_from_faucet( addrs[0], cluster_obj=cluster, - faucet_data=cluster_manager.cache.addrs_data["user1"], + all_faucets=cluster_manager.cache.addrs_data, amount=3_000_000_000, ) diff --git a/cardano_node_tests/utils/governance_setup.py b/cardano_node_tests/utils/governance_setup.py index 8e0b22392..b8d6a4522 100644 --- a/cardano_node_tests/utils/governance_setup.py +++ b/cardano_node_tests/utils/governance_setup.py @@ -113,7 +113,7 @@ def create_vote_stake( clusterlib_utils.fund_from_faucet( *pool_users, cluster_obj=cluster_obj, - faucet_data=cluster_manager.cache.addrs_data["user1"], + faucet_data=cluster_manager.cache.addrs_data["faucet"], amount=500_000_000_000, destination_dir=destination_dir, )