Skip to content

Commit e501f89

Browse files
ImplOfAnImplImplOfAnImpl
committed
Auto-replace gen_range->random_range
1 parent 313a58e commit e501f89

156 files changed

Lines changed: 1213 additions & 1213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api-server/scanner-lib/src/sync/tests/mod.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ async fn randomized(#[case] seed: Seed) {
325325
async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
326326
let mut rng = make_seedable_rng(seed);
327327

328-
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.gen_range(10000..100000);
328+
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.random_range(10000..100000);
329329
let (staking_sk, pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
330330
let (vrf_sk, vrf_pk) = VRFPrivateKey::new_from_rng(&mut rng, VRFKeyKind::Schnorrkel);
331331
let staking_key = Destination::PublicKey(pk.clone());
@@ -335,7 +335,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
335335
vrf_pk,
336336
staking_key.clone(),
337337
PerThousand::new_from_rng(&mut rng),
338-
Amount::from_atoms(rng.gen_range(0..100)),
338+
Amount::from_atoms(rng.random_range(0..100)),
339339
);
340340
let pool_id = PoolId::new(H256::random_using(&mut rng));
341341

@@ -394,7 +394,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
394394
let prev_block_hash = block.get_id();
395395
sync_and_compare(&mut tf, block, &mut local_state, pool_id).await;
396396

397-
let remaining_coins = remaining_coins - rng.gen_range(0..10);
397+
let remaining_coins = remaining_coins - rng.random_range(0..10);
398398
eprintln!("coins: {remaining_coins}");
399399
let transaction = TransactionBuilder::new()
400400
.add_input(
@@ -423,7 +423,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
423423
let prev_block_hash = block.get_id();
424424
sync_and_compare(&mut tf, block, &mut local_state, pool_id).await;
425425

426-
let remaining_coins = remaining_coins - rng.gen_range(0..10);
426+
let remaining_coins = remaining_coins - rng.random_range(0..10);
427427
eprintln!("coins: {remaining_coins}");
428428
let (_, deleg_pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
429429
let transaction = TransactionBuilder::new()
@@ -443,8 +443,8 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
443443
let delegation_id = make_delegation_id(transaction.inputs()).unwrap();
444444
let prev_tx_id = transaction.transaction().get_id();
445445

446-
let amount_to_stake = rng.gen_range(100..1000);
447-
let remaining_coins = remaining_coins - amount_to_stake - rng.gen_range(0..10);
446+
let amount_to_stake = rng.random_range(100..1000);
447+
let remaining_coins = remaining_coins - amount_to_stake - rng.random_range(0..10);
448448
eprintln!("coins: {remaining_coins} {amount_to_stake}");
449449
let stake_transaction = TransactionBuilder::new()
450450
.add_input(
@@ -477,7 +477,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
477477
let prev_block_hash = block.get_id();
478478
sync_and_compare(&mut tf, block, &mut local_state, pool_id).await;
479479

480-
let remaining_coins = remaining_coins - rng.gen_range(0..10);
480+
let remaining_coins = remaining_coins - rng.random_range(0..10);
481481
eprintln!("coins: {remaining_coins}");
482482
let transaction = TransactionBuilder::new()
483483
.add_input(
@@ -507,7 +507,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
507507
sync_and_compare(&mut tf, block, &mut local_state, pool_id).await;
508508

509509
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN
510-
+ rng.gen_range(
510+
+ rng.random_range(
511511
0..remaining_coins - chain_config.min_stake_pool_pledge().into_atoms() - 100,
512512
);
513513
let (new_staking_sk, new_pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
@@ -519,15 +519,15 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
519519
vrf_pk,
520520
staking_key.clone(),
521521
PerThousand::new_from_rng(&mut rng),
522-
Amount::from_atoms(rng.gen_range(0..100)),
522+
Amount::from_atoms(rng.random_range(0..100)),
523523
);
524524
let new_pool_id = PoolId::from_utxo(&UtxoOutPoint::new(
525525
OutPointSourceId::Transaction(prev_tx_id),
526526
0,
527527
));
528528

529529
eprintln!("coins {remaining_coins}, {initial_pledge}");
530-
let remaining_coins = remaining_coins - initial_pledge - rng.gen_range(0..10);
530+
let remaining_coins = remaining_coins - initial_pledge - rng.random_range(0..10);
531531
let transaction = TransactionBuilder::new()
532532
.add_input(
533533
TxInput::from_utxo(OutPointSourceId::Transaction(prev_tx_id), 0),
@@ -559,7 +559,7 @@ async fn compare_pool_rewards_with_chainstate_real_state(#[case] seed: Seed) {
559559
let prev_block_hash = block.get_id();
560560
sync_and_compare(&mut tf, block, &mut local_state, pool_id).await;
561561

562-
let remaining_coins = remaining_coins - rng.gen_range(0..10);
562+
let remaining_coins = remaining_coins - rng.random_range(0..10);
563563
let input1 = TxInput::from_utxo(OutPointSourceId::Transaction(prev_tx_id), 0);
564564
let input2 = TxInput::from_utxo(OutPointSourceId::BlockReward(prev_block_hash.into()), 0);
565565
let transaction = TransactionBuilder::new()
@@ -688,7 +688,7 @@ async fn reorg_locked_balance(#[case] seed: Seed) {
688688
let lock_for_sec = TxOutput::LockThenTransfer(
689689
OutputValue::Coin(Amount::from_atoms(3)),
690690
destination.clone(),
691-
OutputTimeLock::ForSeconds(rng.gen_range(1..=target_block_time.as_secs())),
691+
OutputTimeLock::ForSeconds(rng.random_range(1..=target_block_time.as_secs())),
692692
);
693693
let lock_until_time = TxOutput::LockThenTransfer(
694694
OutputValue::Coin(Amount::from_atoms(4)),
@@ -698,7 +698,7 @@ async fn reorg_locked_balance(#[case] seed: Seed) {
698698
.genesis_block()
699699
.timestamp()
700700
.add_int_seconds(
701-
target_block_time.as_secs() + rng.gen_range(1..=target_block_time.as_secs()),
701+
target_block_time.as_secs() + rng.random_range(1..=target_block_time.as_secs()),
702702
)
703703
.unwrap(),
704704
),

‎api-server/scanner-lib/src/sync/tests/simulation.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ async fn simulation(
188188
let mut statistics: BTreeMap<CoinOrTokenStatistic, BTreeMap<CoinOrTokenId, Amount>> =
189189
BTreeMap::new();
190190

191-
let num_blocks = rng.gen_range((max_blocks / 2)..max_blocks);
191+
let num_blocks = rng.random_range((max_blocks / 2)..max_blocks);
192192
let (vrf_sk, vrf_pk) = VRFPrivateKey::new_from_rng(&mut rng, VRFKeyKind::Schnorrkel);
193193
let (staking_sk, staking_pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
194194
let (config_builder, genesis_pool_id) =
@@ -207,10 +207,10 @@ async fn simulation(
207207
)];
208208
let consensus_upgrades = NetUpgrades::initialize(upgrades).expect("valid net-upgrades");
209209

210-
let epoch_length = NonZeroU64::new(rng.gen_range(1..10)).unwrap();
211-
let sealed_epoch_distance_from_tip = rng.gen_range(1..10);
210+
let epoch_length = NonZeroU64::new(rng.random_range(1..10)).unwrap();
211+
let sealed_epoch_distance_from_tip = rng.random_range(1..10);
212212
let token_id_generation_v1_fork_height =
213-
BlockHeight::new(rng.gen_range(1..=num_blocks + 1) as u64);
213+
BlockHeight::new(rng.random_range(1..=num_blocks + 1) as u64);
214214
let chain_config = config_builder
215215
.consensus_upgrades(consensus_upgrades)
216216
.max_future_block_time_offset(Some(std::time::Duration::from_secs(1_000_000)))
@@ -311,7 +311,7 @@ async fn simulation(
311311
for current_height in 0..num_blocks {
312312
let create_reorg = rng.random_bool(0.1);
313313
let height_to_continue_from = if create_reorg {
314-
rng.gen_range(0..=current_height)
314+
rng.random_range(0..=current_height)
315315
} else {
316316
current_height
317317
};
@@ -376,7 +376,7 @@ async fn simulation(
376376

377377
let mut block_builder = tf.make_pos_block_builder().with_random_staking_pool(&mut rng);
378378

379-
for _ in 0..rng.gen_range(10..max_tx_per_block) {
379+
for _ in 0..rng.random_range(10..max_tx_per_block) {
380380
block_builder = block_builder.add_test_transaction(&mut rng);
381381
}
382382

‎api-server/stack-test-suite/tests/v2/address.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ async fn multiple_outputs_to_single_address(#[case] seed: Seed) {
143143

144144
// Generate two outputs for a single transaction
145145

146-
let random_coin_amount1 = rng.gen_range(1..10);
147-
let random_coin_amount2 = rng.gen_range(1..10);
148-
let random_coin_amount3 = rng.gen_range(1..10);
146+
let random_coin_amount1 = rng.random_range(1..10);
147+
let random_coin_amount2 = rng.random_range(1..10);
148+
let random_coin_amount3 = rng.random_range(1..10);
149149

150150
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount1)).unwrap();
151151
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount2)).unwrap();
@@ -385,9 +385,9 @@ async fn test_unlocking_for_locked_utxos(#[case] seed: Seed) {
385385

386386
// Generate two outputs for a single transaction
387387

388-
let random_coin_amount1 = rng.gen_range(1..10);
389-
let random_coin_amount2 = rng.gen_range(1..10);
390-
let random_coin_amount3 = rng.gen_range(1..10);
388+
let random_coin_amount1 = rng.random_range(1..10);
389+
let random_coin_amount2 = rng.random_range(1..10);
390+
let random_coin_amount3 = rng.random_range(1..10);
391391

392392
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount1)).unwrap();
393393
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount2)).unwrap();
@@ -633,8 +633,8 @@ async fn ok(#[case] seed: Seed) {
633633
.unwrap()
634634
.block_id()];
635635

636-
for _ in 0..rng.gen_range(1..100) {
637-
let random_coin_amount = rng.gen_range(1..10);
636+
for _ in 0..rng.random_range(1..100) {
637+
let random_coin_amount = rng.random_range(1..10);
638638

639639
alice_balance =
640640
(alice_balance - Amount::from_atoms(random_coin_amount)).unwrap();

‎api-server/stack-test-suite/tests/v2/address_all_utxos.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ async fn multiple_utxos_to_single_address(#[case] seed: Seed) {
142142

143143
// Generate two outputs for a single transaction
144144

145-
let random_coin_amount1 = rng.gen_range(1..10);
146-
let random_coin_amount2 = rng.gen_range(1..10);
145+
let random_coin_amount1 = rng.random_range(1..10);
146+
let random_coin_amount2 = rng.random_range(1..10);
147147

148148
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount1)).unwrap();
149149
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount2)).unwrap();
@@ -390,8 +390,8 @@ async fn ok(#[case] seed: Seed) {
390390
.unwrap()
391391
.block_id()];
392392

393-
for _ in 0..rng.gen_range(1..2) {
394-
let random_coin_amount = rng.gen_range(1..10);
393+
for _ in 0..rng.random_range(1..2) {
394+
let random_coin_amount = rng.random_range(1..10);
395395

396396
alice_balance =
397397
(alice_balance - Amount::from_atoms(random_coin_amount * 2)).unwrap();
@@ -408,7 +408,7 @@ async fn ok(#[case] seed: Seed) {
408408
let bob_tx_out2 = TxOutput::LockThenTransfer(
409409
OutputValue::Coin(Amount::from_atoms(random_coin_amount)),
410410
bob_destination.clone(),
411-
OutputTimeLock::ForBlockCount(rng.gen_range(1..100)),
411+
OutputTimeLock::ForBlockCount(rng.random_range(1..100)),
412412
);
413413

414414
let transaction = TransactionBuilder::new()

‎api-server/stack-test-suite/tests/v2/address_delegations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ async fn ok(#[case] seed: Seed) {
119119
&mut tf,
120120
);
121121

122-
let (_transfer_outpoint, mut delegations) = (0..rng.gen_range(0..5)).fold(
122+
let (_transfer_outpoint, mut delegations) = (0..rng.random_range(0..5)).fold(
123123
(transfer_outpoint, vec![]),
124124
|(transfer_outpoint, mut delegations), _| {
125125
if available_amount == Amount::ZERO {

‎api-server/stack-test-suite/tests/v2/address_spendable_utxos.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ async fn multiple_utxos_to_single_address(#[case] seed: Seed) {
145145

146146
// Generate two outputs for a single transaction
147147

148-
let random_coin_amount1 = rng.gen_range(1..10);
149-
let random_coin_amount2 = rng.gen_range(1..10);
148+
let random_coin_amount1 = rng.random_range(1..10);
149+
let random_coin_amount2 = rng.random_range(1..10);
150150

151151
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount1)).unwrap();
152152
alice_balance = (alice_balance - Amount::from_atoms(random_coin_amount2)).unwrap();
@@ -392,8 +392,8 @@ async fn ok(#[case] seed: Seed) {
392392
.unwrap()
393393
.block_id()];
394394

395-
for _ in 0..rng.gen_range(1..100) {
396-
let random_coin_amount = rng.gen_range(1..10);
395+
for _ in 0..rng.random_range(1..100) {
396+
let random_coin_amount = rng.random_range(1..10);
397397

398398
alice_balance =
399399
(alice_balance - Amount::from_atoms(random_coin_amount)).unwrap();

‎api-server/stack-test-suite/tests/v2/address_token_authority.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ async fn ok(#[case] seed: Seed) {
7676

7777
let token_issuance = TokenIssuanceV1 {
7878
token_ticker: "XXXX".as_bytes().to_vec(),
79-
number_of_decimals: rng.gen_range(1..18),
79+
number_of_decimals: rng.random_range(1..18),
8080
metadata_uri: "http://uri".as_bytes().to_vec(),
8181
total_supply: TokenTotalSupply::Unlimited,
8282
authority: dest.clone(),
@@ -121,15 +121,15 @@ async fn ok(#[case] seed: Seed) {
121121
&& (bob_token_ids.is_empty() || rng.random_bool(0.5))
122122
{
123123
(
124-
alice_token_ids.remove(rng.gen_range(0..alice_token_ids.len())),
124+
alice_token_ids.remove(rng.random_range(0..alice_token_ids.len())),
125125
alice_destination.clone(),
126126
bob_destination.clone(),
127127
&alice_sk,
128128
&mut bob_token_ids,
129129
)
130130
} else {
131131
(
132-
bob_token_ids.remove(rng.gen_range(0..bob_token_ids.len())),
132+
bob_token_ids.remove(rng.random_range(0..bob_token_ids.len())),
133133
bob_destination.clone(),
134134
alice_destination.clone(),
135135
&bob_sk,

‎api-server/stack-test-suite/tests/v2/block.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ async fn ok(#[case] seed: Seed) {
7272
let (tx, rx) = tokio::sync::oneshot::channel();
7373

7474
let mut rng = make_seedable_rng(seed);
75-
let block_height = rng.gen_range(2..50);
75+
let block_height = rng.random_range(2..50);
7676
let task = tokio::spawn(async move {
7777
let web_server_state = {
78-
let n_blocks = rng.gen_range(block_height..100);
78+
let n_blocks = rng.random_range(block_height..100);
7979

80-
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.gen_range(10000..100000);
80+
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.random_range(10000..100000);
8181
let (staking_sk, pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
8282
let (vrf_sk, vrf_pk) = VRFPrivateKey::new_from_rng(&mut rng, VRFKeyKind::Schnorrkel);
8383
let staking_key = Destination::PublicKey(pk.clone());
@@ -87,7 +87,7 @@ async fn ok(#[case] seed: Seed) {
8787
vrf_pk,
8888
staking_key.clone(),
8989
PerThousand::new_from_rng(&mut rng),
90-
Amount::from_atoms(rng.gen_range(0..100)),
90+
Amount::from_atoms(rng.random_range(0..100)),
9191
);
9292
let pool_id = PoolId::new(H256::random_using(&mut rng));
9393

@@ -165,7 +165,7 @@ async fn ok(#[case] seed: Seed) {
165165
// create a reorg
166166
let parent_block = chainstate_blocks.get(block_height - 2).unwrap();
167167
let mut prev_block_hash = parent_block.get_id().into();
168-
let count = rng.gen_range(block_height..=100);
168+
let count = rng.random_range(block_height..=100);
169169
tf.set_time_seconds_since_epoch(parent_block.timestamp().as_int_seconds());
170170

171171
let new_chainstate_blocks: Vec<_> = (block_height - 1..count)

‎api-server/stack-test-suite/tests/v2/block_header.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ async fn ok(#[case] seed: Seed) {
7070
let web_server_state = {
7171
let mut rng = make_seedable_rng(seed);
7272

73-
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.gen_range(10000..100000);
73+
let initial_pledge = 40_000 * CoinUnit::ATOMS_PER_COIN + rng.random_range(10000..100000);
7474
let (staking_sk, pk) = PrivateKey::new_from_rng(&mut rng, KeyKind::Secp256k1Schnorr);
7575
let (vrf_sk, vrf_pk) = VRFPrivateKey::new_from_rng(&mut rng, VRFKeyKind::Schnorrkel);
7676
let staking_key = Destination::PublicKey(pk.clone());
@@ -80,7 +80,7 @@ async fn ok(#[case] seed: Seed) {
8080
vrf_pk,
8181
staking_key.clone(),
8282
PerThousand::new_from_rng(&mut rng),
83-
Amount::from_atoms(rng.gen_range(0..100)),
83+
Amount::from_atoms(rng.random_range(0..100)),
8484
);
8585
let pool_id = PoolId::new(H256::random_using(&mut rng));
8686

‎api-server/stack-test-suite/tests/v2/block_reward.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ async fn no_reward(#[case] seed: Seed) {
6767
async move {
6868
let web_server_state = {
6969
let mut rng = make_seedable_rng(seed);
70-
let block_height = rng.gen_range(1..50);
71-
let n_blocks = rng.gen_range(block_height..100);
70+
let block_height = rng.random_range(1..50);
71+
let n_blocks = rng.random_range(block_height..100);
7272

7373
let chain_config = create_unit_test_config();
7474

0 commit comments

Comments
 (0)