Skip to content

Commit 53fa8db

Browse files
mkouramkoura
authored
Merge pull request #2990 from IntersectMBO/min_faucet_funding
feat(faucet): reduce funding amount
2 parents da54f82 + 45e0429 commit 53fa8db

18 files changed

+58
-30
lines changed

‎cardano_node_tests/tests/common.py‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ def get_payment_addrs(
343343
num: int,
344344
fund_idx: list[int] | None = None,
345345
caching_key: str = "",
346+
fund_just_once: bool = False,
346347
amount: int | None = None,
347348
) -> list[clusterlib.AddressRecord]:
348349
"""Create new payment addresses."""
@@ -360,17 +361,21 @@ def _create_addrs() -> list[clusterlib.AddressRecord]:
360361
if caching_key:
361362
fixture_cache: cluster_management.FixtureCache[list[clusterlib.AddressRecord] | None]
362363
with cluster_manager.cache_fixture(key=caching_key) as fixture_cache:
363-
if fixture_cache.value is not None:
364-
return fixture_cache.value
365-
366-
addrs = _create_addrs()
367-
fixture_cache.value = addrs
364+
if fixture_cache.value is None:
365+
addrs = _create_addrs()
366+
fixture_cache.value = addrs
367+
else:
368+
addrs = fixture_cache.value
369+
if fund_just_once:
370+
return addrs
368371
else:
369372
addrs = _create_addrs()
370373

371374
# Fund source addresses
372375
fund_addresses = addrs if fund_idx is None else [addrs[i] for i in fund_idx]
373376
if fund_addresses:
377+
if amount is None:
378+
amount = 200_000_000
374379
clusterlib_utils.fund_from_faucet(
375380
*fund_addresses,
376381
cluster_obj=cluster_obj,
@@ -386,6 +391,7 @@ def get_payment_addr(
386391
cluster_manager: cluster_management.ClusterManager,
387392
cluster_obj: clusterlib.ClusterLib,
388393
caching_key: str = "",
394+
fund_just_once: bool = False,
389395
amount: int | None = None,
390396
) -> clusterlib.AddressRecord:
391397
"""Create a single new payment address."""
@@ -395,6 +401,7 @@ def get_payment_addr(
395401
cluster_obj=cluster_obj,
396402
num=1,
397403
caching_key=caching_key,
404+
fund_just_once=fund_just_once,
398405
amount=amount,
399406
)[0]
400407

@@ -406,6 +413,7 @@ def get_pool_users(
406413
num: int,
407414
fund_idx: list[int] | None = None,
408415
caching_key: str = "",
416+
fund_just_once: bool = False,
409417
amount: int | None = None,
410418
) -> list[clusterlib.PoolUser]:
411419
"""Create new pool users."""
@@ -424,17 +432,22 @@ def _create_pool_users() -> list[clusterlib.PoolUser]:
424432
if caching_key:
425433
fixture_cache: cluster_management.FixtureCache[list[clusterlib.PoolUser] | None]
426434
with cluster_manager.cache_fixture(key=caching_key) as fixture_cache:
427-
if fixture_cache.value is not None:
428-
return fixture_cache.value
435+
if fixture_cache.value is None:
436+
users = _create_pool_users()
437+
fixture_cache.value = users
438+
else:
439+
users = fixture_cache.value
440+
if fund_just_once:
441+
return users
429442

430-
users = _create_pool_users()
431-
fixture_cache.value = users
432443
else:
433444
users = _create_pool_users()
434445

435446
# Fund source addresses
436447
fund_users = users if fund_idx is None else [users[i] for i in fund_idx]
437448
if fund_users:
449+
if amount is None:
450+
amount = 200_000_000
438451
clusterlib_utils.fund_from_faucet(
439452
*fund_users,
440453
cluster_obj=cluster_obj,
@@ -450,6 +463,7 @@ def get_pool_user(
450463
cluster_manager: cluster_management.ClusterManager,
451464
cluster_obj: clusterlib.ClusterLib,
452465
caching_key: str = "",
466+
fund_just_once: bool = False,
453467
amount: int | None = None,
454468
) -> clusterlib.PoolUser:
455469
"""Create a single new pool user."""
@@ -459,6 +473,7 @@ def get_pool_user(
459473
cluster_obj=cluster_obj,
460474
num=1,
461475
caching_key=caching_key,
476+
fund_just_once=fund_just_once,
462477
amount=amount,
463478
)[0]
464479

@@ -468,6 +483,7 @@ def get_registered_pool_user(
468483
cluster_manager: cluster_management.ClusterManager,
469484
cluster_obj: clusterlib.ClusterLib,
470485
caching_key: str = "",
486+
fund_just_once: bool = False,
471487
amount: int | None = None,
472488
) -> clusterlib.PoolUser:
473489
"""Create new registered pool users."""
@@ -476,6 +492,7 @@ def get_registered_pool_user(
476492
cluster_manager=cluster_manager,
477493
cluster_obj=cluster_obj,
478494
caching_key=caching_key,
495+
fund_just_once=fund_just_once,
479496
amount=amount,
480497
)
481498

‎cardano_node_tests/tests/test_delegation.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ def _get_pool_users(
283283
*pool_users,
284284
cluster_obj=cluster,
285285
all_faucets=cluster_manager.cache.addrs_data,
286+
amount=200_000_000,
286287
)
287288

288289
# Step: Delegate the stake addresses to 2 different pools
@@ -413,6 +414,7 @@ def test_deregister_delegated(
413414
*payment_addr_recs,
414415
cluster_obj=cluster,
415416
all_faucets=cluster_manager.cache.addrs_data,
417+
amount=200_000_000,
416418
)
417419

418420
pool_user = clusterlib.PoolUser(payment=payment_addr_recs[1], stake=stake_addr_rec)
@@ -602,6 +604,7 @@ def test_delegate_multisig(
602604
pool_user.payment,
603605
cluster_obj=cluster,
604606
all_faucets=cluster_manager.cache.addrs_data,
607+
amount=200_000_000,
605608
)
606609

607610
clusterlib_utils.wait_for_epoch_interval(

‎cardano_node_tests/tests/test_env_network_id.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def payment_addrs(
106106
num=2,
107107
fund_idx=[0],
108108
caching_key=helpers.get_current_line_str(),
109-
amount=1_000_000_000,
110109
)
111110
return addrs
112111

‎cardano_node_tests/tests/test_pools.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,6 +1895,7 @@ def pool_users(
18951895
num=2,
18961896
fund_idx=[0],
18971897
caching_key=helpers.get_current_line_str(),
1898+
fund_just_once=True,
18981899
amount=600_000_000,
18991900
)
19001901
return created_users

‎cardano_node_tests/tests/test_scripts.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ def payment_addrs(
178178
num=20,
179179
fund_idx=[0],
180180
caching_key=helpers.get_current_line_str(),
181-
amount=10_000_000_000,
182181
)
183182
return addrs
184183

@@ -837,6 +836,7 @@ def payment_addrs(
837836
num=10,
838837
fund_idx=[0],
839838
caching_key=helpers.get_current_line_str(),
839+
fund_just_once=True,
840840
)
841841
return addrs
842842

@@ -2291,7 +2291,6 @@ def payment_addrs(
22912291
num=5,
22922292
fund_idx=[0],
22932293
caching_key=helpers.get_current_line_str(),
2294-
amount=100_000_000,
22952294
)
22962295
return addrs
22972296

‎cardano_node_tests/tests/test_socket_path.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ def payment_addrs(
9999
num=2,
100100
fund_idx=[0],
101101
caching_key=helpers.get_current_line_str(),
102-
amount=100_000_000,
103102
)
104103
return addrs
105104

‎cardano_node_tests/tests/test_staking_rewards.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ def test_reward_amount( # noqa: C901
361361
*payment_addr_recs,
362362
cluster_obj=cluster,
363363
all_faucets=cluster_manager.cache.addrs_data,
364+
amount=200_000_000,
364365
)
365366

366367
pool_user = clusterlib.PoolUser(payment=payment_addr_recs[1], stake=stake_addr_rec)
@@ -1072,6 +1073,7 @@ def test_decreasing_reward_transferred_funds(
10721073
dst_addr_record,
10731074
cluster_obj=cluster,
10741075
all_faucets=cluster_manager.cache.addrs_data,
1076+
amount=200_000_000,
10751077
)
10761078

10771079
# Transfer all funds from payment address back to faucet, so no funds are staked

‎cardano_node_tests/tests/test_tx_basic.py‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,24 @@ def byron_addrs(
5555
"""Create 2 new Byron payment addresses."""
5656
fixture_cache: cluster_management.FixtureCache[list[clusterlib.AddressRecord] | None]
5757
with cluster_manager.cache_fixture() as fixture_cache:
58-
if fixture_cache.value is not None:
59-
return fixture_cache.value
60-
61-
new_byron_addrs = [
62-
clusterlib_utils.gen_byron_addr(
63-
cluster_obj=cluster,
64-
name_template=f"addr_payment_ci{cluster_manager.cluster_instance_num}_{i}",
65-
)
66-
for i in range(2)
67-
]
68-
fixture_cache.value = new_byron_addrs
58+
if fixture_cache.value is None:
59+
new_byron_addrs = [
60+
clusterlib_utils.gen_byron_addr(
61+
cluster_obj=cluster,
62+
name_template=f"addr_payment_ci{cluster_manager.cluster_instance_num}_{i}",
63+
)
64+
for i in range(2)
65+
]
66+
fixture_cache.value = new_byron_addrs
67+
else:
68+
new_byron_addrs = fixture_cache.value
6969

7070
# Fund source addresses
7171
clusterlib_utils.fund_from_faucet(
7272
*new_byron_addrs,
7373
cluster_obj=cluster,
7474
all_faucets=cluster_manager.cache.addrs_data,
75+
amount=10_000_000,
7576
)
7677
return new_byron_addrs
7778

@@ -129,7 +130,7 @@ def cluster_default_tx_era(
129130
@allure.link(helpers.get_vcs_link())
130131
@submit_utils.PARAM_SUBMIT_METHOD
131132
@common.PARAM_USE_BUILD_CMD
132-
@pytest.mark.parametrize("amount", (1_500_000, 2_000_000, 10_000_000))
133+
@pytest.mark.parametrize("amount", (1_500_000, 2_000_000, 5_000_000))
133134
@pytest.mark.parametrize(
134135
"dst_addr_type", ("shelley", "byron"), ids=("dst_shelley", "dst_byron")
135136
)
@@ -1172,6 +1173,7 @@ def payment_addrs(
11721173
num=201,
11731174
fund_idx=[0],
11741175
caching_key=helpers.get_current_line_str(),
1176+
fund_just_once=True,
11751177
amount=90_000_000_000,
11761178
)
11771179
return addrs

‎cardano_node_tests/tests/test_tx_many_utxos.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ def payment_addrs(
4747
cluster_obj=cluster,
4848
num=3,
4949
fund_idx=[0],
50+
fund_just_once=True,
5051
amount=800_000_000_000,
5152
)
5253
return addrs

‎cardano_node_tests/tests/test_tx_negative.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def pool_users(
7777
cluster_obj=cluster,
7878
num=3,
7979
caching_key=helpers.get_current_line_str(),
80+
fund_just_once=True,
8081
)
8182
return created_users
8283

0 commit comments

Comments
 (0)