Skip to content

Commit 35bd29e

Browse files
camfairchildcamfairchild
committed
use new add network fn for mech
1 parent 0acdb73 commit 35bd29e

22 files changed

+351
-350
lines changed

‎pallets/subtensor/src/tests/children.rs‎

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

‎pallets/subtensor/src/tests/coinbase.rs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn test_coinbase_tao_issuance_base_low() {
105105
new_test_ext(1).execute_with(|| {
106106
let netuid = NetUid::from(1);
107107
let emission = TaoCurrency::from(1);
108-
add_network(netuid, 1, 0);
108+
add_network(netuid, 1, 0, 1);
109109
assert_eq!(SubnetTAO::<Test>::get(netuid), TaoCurrency::ZERO);
110110
SubtensorModule::run_coinbase(U96F32::from_num(emission));
111111
assert_eq!(SubnetTAO::<Test>::get(netuid), emission);
@@ -152,9 +152,9 @@ fn test_coinbase_tao_issuance_multiple() {
152152
let netuid2 = NetUid::from(2);
153153
let netuid3 = NetUid::from(3);
154154
let emission = TaoCurrency::from(3_333_333);
155-
add_network(netuid1, 1, 0);
156-
add_network(netuid2, 1, 0);
157-
add_network(netuid3, 1, 0);
155+
add_network(netuid1, 1, 0, 0);
156+
add_network(netuid2, 1, 0, 0);
157+
add_network(netuid3, 1, 0, 0);
158158
assert_eq!(SubnetTAO::<Test>::get(netuid1), TaoCurrency::ZERO);
159159
assert_eq!(SubnetTAO::<Test>::get(netuid2), TaoCurrency::ZERO);
160160
assert_eq!(SubnetTAO::<Test>::get(netuid3), TaoCurrency::ZERO);
@@ -191,8 +191,8 @@ fn test_coinbase_tao_issuance_different_prices() {
191191
let netuid1 = NetUid::from(1);
192192
let netuid2 = NetUid::from(2);
193193
let emission = 100_000_000;
194-
add_network(netuid1, 1, 0);
195-
add_network(netuid2, 1, 0);
194+
add_network(netuid1, 1, 0, 0);
195+
add_network(netuid2, 1, 0, 0);
196196

197197
// Setup prices 0.1 and 0.2
198198
let initial_tao: u64 = 100_000_u64;
@@ -350,7 +350,7 @@ fn test_coinbase_tao_issuance_different_prices() {
350350
fn test_coinbase_moving_prices() {
351351
new_test_ext(1).execute_with(|| {
352352
let netuid = NetUid::from(1);
353-
add_network(netuid, 1, 0);
353+
add_network(netuid, 1, 0, 0);
354354
// Set price to 1.0
355355
SubnetTAO::<Test>::insert(netuid, TaoCurrency::from(1_000_000));
356356
SubnetAlphaIn::<Test>::insert(netuid, AlphaCurrency::from(1_000_000));
@@ -406,7 +406,7 @@ fn test_coinbase_moving_prices() {
406406
fn test_update_moving_price_initial() {
407407
new_test_ext(1).execute_with(|| {
408408
let netuid = NetUid::from(1);
409-
add_network(netuid, 1, 0);
409+
add_network(netuid, 1, 0, 0);
410410
// Set current price to 1.0
411411
SubnetTAO::<Test>::insert(netuid, TaoCurrency::from(1_000_000));
412412
SubnetAlphaIn::<Test>::insert(netuid, AlphaCurrency::from(1_000_000));
@@ -431,7 +431,7 @@ fn test_update_moving_price_initial() {
431431
fn test_update_moving_price_after_time() {
432432
new_test_ext(1).execute_with(|| {
433433
let netuid = NetUid::from(1);
434-
add_network(netuid, 1, 0);
434+
add_network(netuid, 1, 0, 0);
435435
// Set current price to 1.0
436436
SubnetTAO::<Test>::insert(netuid, TaoCurrency::from(1_000_000));
437437
SubnetAlphaIn::<Test>::insert(netuid, AlphaCurrency::from(1_000_000));
@@ -462,8 +462,8 @@ fn test_coinbase_alpha_issuance_base() {
462462
let netuid1 = NetUid::from(1);
463463
let netuid2 = NetUid::from(2);
464464
let emission: u64 = 1_000_000;
465-
add_network(netuid1, 1, 0);
466-
add_network(netuid2, 1, 0);
465+
add_network(netuid1, 1, 0, 0);
466+
add_network(netuid2, 1, 0, 0);
467467
// Set up prices 1 and 1
468468
let initial: u64 = 1_000_000;
469469
SubnetTAO::<Test>::insert(netuid1, TaoCurrency::from(initial));
@@ -499,8 +499,8 @@ fn test_coinbase_alpha_issuance_different() {
499499
let netuid1 = NetUid::from(1);
500500
let netuid2 = NetUid::from(2);
501501
let emission: u64 = 1_000_000;
502-
add_network(netuid1, 1, 0);
503-
add_network(netuid2, 1, 0);
502+
add_network(netuid1, 1, 0, 0);
503+
add_network(netuid2, 1, 0, 0);
504504
// Make subnets dynamic.
505505
SubnetMechanism::<Test>::insert(netuid1, 1);
506506
SubnetMechanism::<Test>::insert(netuid2, 1);
@@ -538,8 +538,8 @@ fn test_coinbase_alpha_issuance_with_cap_trigger() {
538538
let netuid1 = NetUid::from(1);
539539
let netuid2 = NetUid::from(2);
540540
let emission: u64 = 1_000_000;
541-
add_network(netuid1, 1, 0);
542-
add_network(netuid2, 1, 0);
541+
add_network(netuid1, 1, 0, 0);
542+
add_network(netuid2, 1, 0, 0);
543543
// Make subnets dynamic.
544544
SubnetMechanism::<Test>::insert(netuid1, 1);
545545
SubnetMechanism::<Test>::insert(netuid2, 1);
@@ -573,8 +573,8 @@ fn test_coinbase_alpha_issuance_with_cap_trigger_and_block_emission() {
573573
let netuid1 = NetUid::from(1);
574574
let netuid2 = NetUid::from(2);
575575
let emission: u64 = 1_000_000;
576-
add_network(netuid1, 1, 0);
577-
add_network(netuid2, 1, 0);
576+
add_network(netuid1, 1, 0, 0);
577+
add_network(netuid2, 1, 0, 0);
578578

579579
// Make subnets dynamic.
580580
SubnetMechanism::<Test>::insert(netuid1, 1);
@@ -645,7 +645,7 @@ fn test_coinbase_alpha_issuance_with_cap_trigger_and_block_emission() {
645645
fn test_owner_cut_base() {
646646
new_test_ext(1).execute_with(|| {
647647
let netuid = NetUid::from(1);
648-
add_network(netuid, 1, 0);
648+
add_network(netuid, 1, 0, 0);
649649
mock::setup_reserves(netuid, 1_000_000_000_000.into(), 1_000_000_000_000.into());
650650
SubtensorModule::set_tempo(netuid, 10000); // Large number (dont drain)
651651
SubtensorModule::set_subnet_owner_cut(0);
@@ -663,7 +663,7 @@ fn test_pending_emission() {
663663
new_test_ext(1).execute_with(|| {
664664
let netuid = NetUid::from(1);
665665
let emission: u64 = 1_000_000;
666-
add_network(netuid, 1, 0);
666+
add_network(netuid, 1, 0, 0);
667667
mock::setup_reserves(netuid, 1_000_000.into(), 1.into());
668668
SubtensorModule::run_coinbase(U96F32::from_num(0));
669669
SubnetTAO::<Test>::insert(NetUid::ROOT, TaoCurrency::from(1_000_000_000)); // Add root weight.
@@ -700,7 +700,7 @@ fn test_drain_base() {
700700
fn test_drain_base_with_subnet() {
701701
new_test_ext(1).execute_with(|| {
702702
let netuid = NetUid::from(1);
703-
add_network(netuid, 1, 0);
703+
add_network(netuid, 1, 0, 0);
704704
SubtensorModule::drain_pending_emission(
705705
netuid,
706706
AlphaCurrency::ZERO,
@@ -716,7 +716,7 @@ fn test_drain_base_with_subnet() {
716716
fn test_drain_base_with_subnet_with_single_staker_not_registered() {
717717
new_test_ext(1).execute_with(|| {
718718
let netuid = NetUid::from(1);
719-
add_network(netuid, 1, 0);
719+
add_network(netuid, 1, 0, 0);
720720
let hotkey = U256::from(1);
721721
let coldkey = U256::from(2);
722722
let stake_before = AlphaCurrency::from(1_000_000_000);
@@ -745,7 +745,7 @@ fn test_drain_base_with_subnet_with_single_staker_not_registered() {
745745
fn test_drain_base_with_subnet_with_single_staker_registered() {
746746
new_test_ext(1).execute_with(|| {
747747
let netuid = NetUid::from(1);
748-
add_network(netuid, 1, 0);
748+
add_network(netuid, 1, 0, 0);
749749
let hotkey = U256::from(1);
750750
let coldkey = U256::from(2);
751751
let stake_before = AlphaCurrency::from(1_000_000_000);
@@ -779,7 +779,7 @@ fn test_drain_base_with_subnet_with_single_staker_registered() {
779779
fn test_drain_base_with_subnet_with_single_staker_registered_root_weight() {
780780
new_test_ext(1).execute_with(|| {
781781
let netuid = NetUid::from(1);
782-
add_network(netuid, 1, 0);
782+
add_network(netuid, 1, 0, 0);
783783
let hotkey = U256::from(1);
784784
let coldkey = U256::from(2);
785785
let stake_before = AlphaCurrency::from(1_000_000_000);
@@ -830,7 +830,7 @@ fn test_drain_base_with_subnet_with_single_staker_registered_root_weight() {
830830
fn test_drain_base_with_subnet_with_two_stakers_registered() {
831831
new_test_ext(1).execute_with(|| {
832832
let netuid = NetUid::from(1);
833-
add_network(netuid, 1, 0);
833+
add_network(netuid, 1, 0, 0);
834834
let hotkey1 = U256::from(1);
835835
let hotkey2 = U256::from(2);
836836
let coldkey = U256::from(3);
@@ -879,7 +879,7 @@ fn test_drain_base_with_subnet_with_two_stakers_registered() {
879879
fn test_drain_base_with_subnet_with_two_stakers_registered_and_root() {
880880
new_test_ext(1).execute_with(|| {
881881
let netuid = NetUid::from(1);
882-
add_network(netuid, 1, 0);
882+
add_network(netuid, 1, 0, 0);
883883
let hotkey1 = U256::from(1);
884884
let hotkey2 = U256::from(2);
885885
let coldkey = U256::from(3);
@@ -955,7 +955,7 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root() {
955955
fn test_drain_base_with_subnet_with_two_stakers_registered_and_root_different_amounts() {
956956
new_test_ext(1).execute_with(|| {
957957
let netuid = NetUid::from(1);
958-
add_network(netuid, 1, 0);
958+
add_network(netuid, 1, 0, 0);
959959
let hotkey1 = U256::from(1);
960960
let hotkey2 = U256::from(2);
961961
let coldkey = U256::from(3);
@@ -1036,7 +1036,7 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root_different_am
10361036
{
10371037
new_test_ext(1).execute_with(|| {
10381038
let netuid = NetUid::from(1);
1039-
add_network(netuid, 1, 0);
1039+
add_network(netuid, 1, 0, 0);
10401040
let hotkey1 = U256::from(1);
10411041
let hotkey2 = U256::from(2);
10421042
let coldkey = U256::from(3);
@@ -1116,7 +1116,7 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root_different_am
11161116
fn test_drain_alpha_childkey_parentkey() {
11171117
new_test_ext(1).execute_with(|| {
11181118
let netuid = NetUid::from(1);
1119-
add_network(netuid, 1, 0);
1119+
add_network(netuid, 1, 0, 0);
11201120
SubtensorModule::set_ck_burn(0);
11211121
let parent = U256::from(1);
11221122
let child = U256::from(2);
@@ -1165,8 +1165,8 @@ fn test_get_root_children() {
11651165
new_test_ext(1).execute_with(|| {
11661166
// Init netuid 1
11671167
let alpha = NetUid::from(1);
1168-
add_network(NetUid::ROOT, 1, 0);
1169-
add_network(alpha, 1, 0);
1168+
add_network(NetUid::ROOT, 1, 0, 0);
1169+
add_network(alpha, 1, 0, 0);
11701170

11711171
// Set TAO weight to 1.
11721172
SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
@@ -1291,8 +1291,8 @@ fn test_get_root_children_drain() {
12911291
new_test_ext(1).execute_with(|| {
12921292
// Init netuid 1
12931293
let alpha = NetUid::from(1);
1294-
add_network(NetUid::ROOT, 1, 0);
1295-
add_network(alpha, 1, 0);
1294+
add_network(NetUid::ROOT, 1, 0, 0);
1295+
add_network(alpha, 1, 0, 0);
12961296
SubtensorModule::set_ck_burn(0);
12971297
// Set TAO weight to 1.
12981298
SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
@@ -1438,8 +1438,8 @@ fn test_get_root_children_drain_half_proportion() {
14381438
new_test_ext(1).execute_with(|| {
14391439
// Init netuid 1
14401440
let alpha = NetUid::from(1);
1441-
add_network(NetUid::ROOT, 1, 0);
1442-
add_network(alpha, 1, 0);
1441+
add_network(NetUid::ROOT, 1, 0, 0);
1442+
add_network(alpha, 1, 0, 0);
14431443
SubtensorModule::set_ck_burn(0);
14441444
// Set TAO weight to 1.
14451445
SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
@@ -1527,8 +1527,8 @@ fn test_get_root_children_drain_with_take() {
15271527
new_test_ext(1).execute_with(|| {
15281528
// Init netuid 1
15291529
let alpha = NetUid::from(1);
1530-
add_network(NetUid::ROOT, 1, 0);
1531-
add_network(alpha, 1, 0);
1530+
add_network(NetUid::ROOT, 1, 0, 0);
1531+
add_network(alpha, 1, 0, 0);
15321532
// Set TAO weight to 1.
15331533
SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
15341534
// Create keys.
@@ -1614,8 +1614,8 @@ fn test_get_root_children_drain_with_half_take() {
16141614
new_test_ext(1).execute_with(|| {
16151615
// Init netuid 1
16161616
let alpha = NetUid::from(1);
1617-
add_network(NetUid::ROOT, 1, 0);
1618-
add_network(alpha, 1, 0);
1617+
add_network(NetUid::ROOT, 1, 0, 0);
1618+
add_network(alpha, 1, 0, 0);
16191619
// Set TAO weight to 1.
16201620
SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
16211621
SubtensorModule::set_ck_burn(0);
@@ -1702,8 +1702,8 @@ fn test_get_root_children_drain_with_half_take() {
17021702
// new_test_ext(1).execute_with(|| {
17031703
// // Init netuid 1
17041704
// let alpha = NetUid::from(1);
1705-
// add_network(NetUid::ROOT, 1, 0);
1706-
// add_network(alpha, 1, 0);
1705+
// add_network(NetUid::ROOT, 1, 0, 0);
1706+
// add_network(alpha, 1, 0, 0);
17071707
// // Set TAO weight to 1.
17081708
// SubtensorModule::set_tao_weight(u64::MAX); // Set TAO weight to 1.
17091709
// // Create keys.
@@ -2735,7 +2735,7 @@ fn test_coinbase_v3_liquidity_update() {
27352735
fn test_drain_alpha_childkey_parentkey_with_burn() {
27362736
new_test_ext(1).execute_with(|| {
27372737
let netuid = NetUid::from(1);
2738-
add_network(netuid, 1, 0);
2738+
add_network(netuid, 1, 0, 0);
27392739
let parent = U256::from(1);
27402740
let child = U256::from(2);
27412741
let coldkey = U256::from(3);

‎pallets/subtensor/src/tests/consensus.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn init_run_epochs(
167167
bonds_penalty: u16,
168168
) {
169169
// === Create the network
170-
add_network(netuid, u16::MAX - 1, 0); // set higher tempo to avoid built-in epoch, then manual epoch instead
170+
add_network(netuid, u16::MAX - 1, 0, 0); // set higher tempo to avoid built-in epoch, then manual epoch instead
171171

172172
// === Set bonds penalty
173173
SubtensorModule::set_bonds_penalty(netuid, bonds_penalty);

‎pallets/subtensor/src/tests/difficulty.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn test_registration_difficulty_adjustment() {
1313
let netuid = NetUid::from(1);
1414
let tempo: u16 = 1;
1515
let modality: u16 = 1;
16-
add_network(netuid, tempo, modality);
16+
add_network(netuid, tempo, modality, 0);
1717

1818
// owners are not deregistered
1919
crate::SubnetOwner::<Test>::insert(netuid, U256::from(99999));

‎pallets/subtensor/src/tests/ensure.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::{OwnerHyperparamRateLimit, SubnetOwner, SubtokenEnabled};
1212
fn ensure_subnet_owner_returns_who_and_checks_ownership() {
1313
new_test_ext(1).execute_with(|| {
1414
let netuid = NetUid::from(1);
15-
add_network(netuid, 10, 0);
15+
add_network(netuid, 10, 0, 0);
1616

1717
let owner: U256 = U256::from(42);
1818
SubnetOwner::<Test>::insert(netuid, owner);
@@ -40,7 +40,7 @@ fn ensure_subnet_owner_returns_who_and_checks_ownership() {
4040
fn ensure_subnet_owner_or_root_distinguishes_root_and_owner() {
4141
new_test_ext(1).execute_with(|| {
4242
let netuid = NetUid::from(2);
43-
add_network(netuid, 10, 0);
43+
add_network(netuid, 10, 0, 0);
4444
let owner: U256 = U256::from(9);
4545
SubnetOwner::<Test>::insert(netuid, owner);
4646

@@ -67,7 +67,7 @@ fn ensure_root_with_rate_limit_blocks_in_freeze_window() {
6767
new_test_ext(1).execute_with(|| {
6868
let netuid = NetUid::from(1);
6969
let tempo = 10;
70-
add_network(netuid, 10, 0);
70+
add_network(netuid, 10, 0, 0);
7171

7272
// Set freeze window to 3
7373
let freeze_window = 3;
@@ -91,7 +91,7 @@ fn ensure_owner_or_root_with_limits_checks_rl_and_freeze() {
9191
new_test_ext(1).execute_with(|| {
9292
let netuid = NetUid::from(1);
9393
let tempo = 10;
94-
add_network(netuid, 10, 0);
94+
add_network(netuid, 10, 0, 0);
9595
SubtokenEnabled::<Test>::insert(netuid, true);
9696
let owner: U256 = U256::from(5);
9797
SubnetOwner::<Test>::insert(netuid, owner);

‎pallets/subtensor/src/tests/epoch.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ fn init_run_epochs(
493493
// new_test_ext(1).execute_with(|| {
494494
// log::info!("test_overflow:");
495495
// let netuid = NetUid::from(1);
496-
// add_network(netuid, 1, 0);
496+
// add_network(netuid, 1, 0, 0);
497497
// SubtensorModule::set_max_allowed_uids(netuid, 3);
498498
// SubtensorModule::increase_stake_on_coldkey_hotkey_account(
499499
// &U256::from(0),
@@ -2160,7 +2160,7 @@ fn test_validator_permits() {
21602160
}
21612161
new_test_ext(1).execute_with(|| {
21622162
let block_number: u64 = 0;
2163-
add_network(netuid, tempo, 0);
2163+
add_network(netuid, tempo, 0, 0);
21642164
SubtensorModule::set_max_allowed_uids(netuid, network_n as u16);
21652165
assert_eq!(
21662166
SubtensorModule::get_max_allowed_uids(netuid),
@@ -2420,7 +2420,7 @@ fn test_blocks_since_last_step() {
24202420

24212421
let netuid = NetUid::from(1);
24222422
let tempo: u16 = 7200;
2423-
add_network(netuid, tempo, 0);
2423+
add_network(netuid, tempo, 0, 0);
24242424

24252425
let original_blocks: u64 = SubtensorModule::get_blocks_since_last_step(netuid);
24262426

@@ -2530,7 +2530,7 @@ fn test_epoch_outputs_single_staker_registered_no_weights() {
25302530
new_test_ext(1).execute_with(|| {
25312531
let netuid = NetUid::from(1);
25322532
let high_tempo: u16 = u16::MAX - 1; // Don't run automatically.
2533-
add_network(netuid, high_tempo, 0);
2533+
add_network(netuid, high_tempo, 0, 0);
25342534

25352535
let hotkey = U256::from(1);
25362536
let coldkey = U256::from(2);
@@ -3583,7 +3583,7 @@ fn test_epoch_masks_incoming_to_sniped_uid_prevents_inheritance() {
35833583
let tempo: u16 = 10;
35843584
let reveal: u64 = 2;
35853585

3586-
add_network(netuid, tempo, 0);
3586+
add_network(netuid, tempo, 0, 0);
35873587
assert_ok!(SubtensorModule::set_reveal_period(netuid, reveal));
35883588
SubtensorModule::set_commit_reveal_weights_enabled(netuid, true);
35893589
SubtensorModule::set_max_allowed_uids(netuid, 3);
@@ -3679,7 +3679,7 @@ fn test_epoch_no_mask_when_commit_reveal_disabled() {
36793679
new_test_ext(1).execute_with(|| {
36803680
let netuid = NetUid::from(32);
36813681
let tempo: u16 = 5;
3682-
add_network(netuid, tempo, 0);
3682+
add_network(netuid, tempo, 0, 0);
36833683
SubtensorModule::set_commit_reveal_weights_enabled(netuid, false);
36843684

36853685
let (hot, cold) = (U256::from(1000), U256::from(1100));
@@ -3728,7 +3728,7 @@ fn test_epoch_does_not_mask_outside_window_but_masks_inside() {
37283728
let tempo: u16 = 8;
37293729
let reveal: u16 = 2;
37303730

3731-
add_network(netuid, tempo, 0);
3731+
add_network(netuid, tempo, 0, 0);
37323732
assert_ok!(SubtensorModule::set_reveal_period(netuid, reveal as u64));
37333733
SubtensorModule::set_commit_reveal_weights_enabled(netuid, true);
37343734
SubtensorModule::set_target_registrations_per_interval(netuid, u16::MAX);

0 commit comments

Comments
 (0)