Skip to content

Commit e22840e

Browse files
camfairchildcamfairchild
committed
remove arg and total internally
1 parent 73e2066 commit e22840e

File tree

4 files changed

+2
-37
lines changed

4 files changed

+2
-37
lines changed

‎pallets/subtensor/src/benchmarks.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1619,7 +1619,6 @@ mod pallet_benchmarks {
16191619
netuid,
16201620
AlphaCurrency::ZERO,
16211621
pending_root_alpha.into(),
1622-
pending_root_alpha.into(), // alpha out
16231622
AlphaCurrency::ZERO,
16241623
);
16251624

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,11 @@ impl<T: Config> Pallet<T> {
240240
let owner_cut = PendingOwnerCut::<T>::get(netuid);
241241
PendingOwnerCut::<T>::insert(netuid, AlphaCurrency::ZERO);
242242

243-
// Drain pending root alpha divs, alpha emission, and owner cut.
243+
// Distribute the emission.
244244
Self::distribute_emission(
245245
netuid,
246246
pending_alpha,
247247
pending_root_alpha,
248-
pending_alpha.saturating_add(pending_root_alpha),
249248
owner_cut,
250249
);
251250
} else {
@@ -609,14 +608,14 @@ impl<T: Config> Pallet<T> {
609608
netuid: NetUid,
610609
pending_alpha: AlphaCurrency,
611610
pending_root_alpha: AlphaCurrency,
612-
total_alpha: AlphaCurrency,
613611
owner_cut: AlphaCurrency,
614612
) {
615613
log::debug!(
616614
"Draining pending alpha emission for netuid {netuid:?}, pending_alpha: {pending_alpha:?}, pending_root_alpha: {pending_root_alpha:?}, owner_cut: {owner_cut:?}"
617615
);
618616

619617
let tao_weight = Self::get_tao_weight();
618+
let total_alpha = pending_alpha.saturating_add(pending_root_alpha);
620619

621620
// Run the epoch.
622621
let hotkey_emission: Vec<(T::AccountId, AlphaCurrency, AlphaCurrency)> =

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ fn test_claim_root_with_drain_emissions() {
7676
netuid,
7777
AlphaCurrency::ZERO,
7878
pending_root_alpha.into(),
79-
pending_root_alpha.into(), // alpha out
8079
AlphaCurrency::ZERO,
8180
);
8281

@@ -145,7 +144,6 @@ fn test_claim_root_with_drain_emissions() {
145144
netuid,
146145
AlphaCurrency::ZERO,
147146
pending_root_alpha.into(),
148-
pending_root_alpha.into(), // alpha out
149147
AlphaCurrency::ZERO,
150148
);
151149

@@ -247,7 +245,6 @@ fn test_claim_root_adding_stake_proportionally_for_two_stakers() {
247245
netuid,
248246
AlphaCurrency::ZERO,
249247
pending_root_alpha.into(),
250-
pending_root_alpha.into(), // alpha out
251248
AlphaCurrency::ZERO,
252249
);
253250

@@ -349,7 +346,6 @@ fn test_claim_root_adding_stake_disproportionally_for_two_stakers() {
349346
netuid,
350347
AlphaCurrency::ZERO,
351348
pending_root_alpha.into(),
352-
pending_root_alpha.into(), // alpha out
353349
AlphaCurrency::ZERO,
354350
);
355351

@@ -441,7 +437,6 @@ fn test_claim_root_with_changed_stake() {
441437
netuid,
442438
AlphaCurrency::ZERO,
443439
pending_root_alpha.into(),
444-
pending_root_alpha.into(), // alpha out
445440
AlphaCurrency::ZERO,
446441
);
447442

@@ -494,7 +489,6 @@ fn test_claim_root_with_changed_stake() {
494489
netuid,
495490
AlphaCurrency::ZERO,
496491
pending_root_alpha.into(),
497-
pending_root_alpha.into(), // alpha out
498492
AlphaCurrency::ZERO,
499493
);
500494

@@ -548,7 +542,6 @@ fn test_claim_root_with_changed_stake() {
548542
netuid,
549543
AlphaCurrency::ZERO,
550544
pending_root_alpha.into(),
551-
pending_root_alpha.into(), // alpha out
552545
AlphaCurrency::ZERO,
553546
);
554547

@@ -641,7 +634,6 @@ fn test_claim_root_with_drain_emissions_and_swap_claim_type() {
641634
netuid,
642635
AlphaCurrency::ZERO,
643636
pending_root_alpha.into(),
644-
pending_root_alpha.into(), // alpha out
645637
AlphaCurrency::ZERO,
646638
);
647639

@@ -686,7 +678,6 @@ fn test_claim_root_with_drain_emissions_and_swap_claim_type() {
686678
netuid,
687679
AlphaCurrency::ZERO,
688680
pending_root_alpha.into(),
689-
pending_root_alpha.into(), // alpha out
690681
AlphaCurrency::ZERO,
691682
);
692683

@@ -723,7 +714,6 @@ fn test_claim_root_with_drain_emissions_and_swap_claim_type() {
723714
netuid,
724715
AlphaCurrency::ZERO,
725716
pending_root_alpha.into(),
726-
pending_root_alpha.into(), // alpha out
727717
AlphaCurrency::ZERO,
728718
);
729719

@@ -1110,7 +1100,6 @@ fn test_claim_root_with_swap_coldkey() {
11101100
netuid,
11111101
AlphaCurrency::ZERO,
11121102
pending_root_alpha.into(),
1113-
pending_root_alpha.into(), // alpha out
11141103
AlphaCurrency::ZERO,
11151104
);
11161105

@@ -1201,7 +1190,6 @@ fn test_claim_root_with_swap_hotkey() {
12011190
netuid,
12021191
AlphaCurrency::ZERO,
12031192
pending_root_alpha.into(),
1204-
pending_root_alpha.into(), // alpha out
12051193
AlphaCurrency::ZERO,
12061194
);
12071195

@@ -1318,7 +1306,6 @@ fn test_claim_root_on_network_deregistration() {
13181306
netuid,
13191307
AlphaCurrency::ZERO,
13201308
pending_root_alpha.into(),
1321-
pending_root_alpha.into(), // alpha out
13221309
AlphaCurrency::ZERO,
13231310
);
13241311

@@ -1459,7 +1446,6 @@ fn test_claim_root_with_unrelated_subnets() {
14591446
netuid,
14601447
AlphaCurrency::ZERO,
14611448
pending_root_alpha.into(),
1462-
pending_root_alpha.into(), // alpha out
14631449
AlphaCurrency::ZERO,
14641450
);
14651451

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,6 @@ fn test_drain_base() {
690690
AlphaCurrency::ZERO,
691691
AlphaCurrency::ZERO,
692692
AlphaCurrency::ZERO,
693-
AlphaCurrency::ZERO,
694693
)
695694
});
696695
}
@@ -706,7 +705,6 @@ fn test_drain_base_with_subnet() {
706705
AlphaCurrency::ZERO,
707706
AlphaCurrency::ZERO,
708707
AlphaCurrency::ZERO,
709-
AlphaCurrency::ZERO,
710708
)
711709
});
712710
}
@@ -732,7 +730,6 @@ fn test_drain_base_with_subnet_with_single_staker_not_registered() {
732730
pending_alpha.into(),
733731
AlphaCurrency::ZERO,
734732
AlphaCurrency::ZERO,
735-
AlphaCurrency::ZERO,
736733
);
737734
let stake_after =
738735
SubtensorModule::get_stake_for_hotkey_and_coldkey_on_subnet(&hotkey, &coldkey, netuid);
@@ -761,7 +758,6 @@ fn test_drain_base_with_subnet_with_single_staker_registered() {
761758
netuid,
762759
pending_alpha,
763760
AlphaCurrency::ZERO,
764-
pending_alpha,
765761
AlphaCurrency::ZERO,
766762
);
767763
let stake_after =
@@ -806,7 +802,6 @@ fn test_drain_base_with_subnet_with_single_staker_registered_root_weight() {
806802
netuid,
807803
pending_alpha,
808804
pending_root_alpha,
809-
pending_alpha.saturating_add(pending_root_alpha),
810805
AlphaCurrency::ZERO,
811806
);
812807
let stake_after =
@@ -854,7 +849,6 @@ fn test_drain_base_with_subnet_with_two_stakers_registered() {
854849
netuid,
855850
pending_alpha,
856851
AlphaCurrency::ZERO,
857-
pending_alpha,
858852
AlphaCurrency::ZERO,
859853
);
860854
let stake_after1 =
@@ -920,7 +914,6 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root() {
920914
netuid,
921915
pending_alpha,
922916
AlphaCurrency::ZERO,
923-
pending_alpha,
924917
AlphaCurrency::ZERO,
925918
);
926919
let stake_after1 =
@@ -996,7 +989,6 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root_different_am
996989
netuid,
997990
pending_alpha,
998991
AlphaCurrency::ZERO,
999-
pending_alpha,
1000992
0.into(),
1001993
);
1002994
let stake_after1 =
@@ -1077,7 +1069,6 @@ fn test_drain_base_with_subnet_with_two_stakers_registered_and_root_different_am
10771069
netuid,
10781070
pending_alpha,
10791071
AlphaCurrency::ZERO,
1080-
pending_alpha,
10811072
AlphaCurrency::ZERO,
10821073
);
10831074
let stake_after1 =
@@ -1139,7 +1130,6 @@ fn test_drain_alpha_childkey_parentkey() {
11391130
netuid,
11401131
pending_alpha,
11411132
AlphaCurrency::ZERO,
1142-
pending_alpha,
11431133
AlphaCurrency::ZERO,
11441134
);
11451135
let parent_stake_after = SubtensorModule::get_stake_for_hotkey_on_subnet(&parent, netuid);
@@ -1365,7 +1355,6 @@ fn test_get_root_children_drain() {
13651355
alpha,
13661356
pending_alpha,
13671357
AlphaCurrency::ZERO,
1368-
pending_alpha,
13691358
AlphaCurrency::ZERO,
13701359
);
13711360

@@ -1390,7 +1379,6 @@ fn test_get_root_children_drain() {
13901379
pending_alpha,
13911380
// pending_root1,
13921381
AlphaCurrency::ZERO,
1393-
pending_alpha,
13941382
AlphaCurrency::ZERO,
13951383
);
13961384

@@ -1414,7 +1402,6 @@ fn test_get_root_children_drain() {
14141402
alpha,
14151403
pending_alpha,
14161404
AlphaCurrency::ZERO,
1417-
pending_alpha,
14181405
AlphaCurrency::ZERO,
14191406
);
14201407

@@ -1503,7 +1490,6 @@ fn test_get_root_children_drain_half_proportion() {
15031490
alpha,
15041491
pending_alpha,
15051492
AlphaCurrency::ZERO,
1506-
pending_alpha,
15071493
AlphaCurrency::ZERO,
15081494
);
15091495

@@ -1590,7 +1576,6 @@ fn test_get_root_children_drain_with_take() {
15901576
alpha,
15911577
pending_alpha,
15921578
AlphaCurrency::ZERO,
1593-
pending_alpha,
15941579
AlphaCurrency::ZERO,
15951580
);
15961581

@@ -1678,7 +1663,6 @@ fn test_get_root_children_drain_with_half_take() {
16781663
alpha,
16791664
pending_alpha,
16801665
AlphaCurrency::ZERO,
1681-
pending_alpha,
16821666
AlphaCurrency::ZERO,
16831667
);
16841668

@@ -2394,7 +2378,6 @@ fn test_distribute_emission_no_miners_all_drained() {
23942378
netuid,
23952379
emission,
23962380
AlphaCurrency::ZERO,
2397-
emission,
23982381
AlphaCurrency::ZERO,
23992382
);
24002383

@@ -2468,7 +2451,6 @@ fn test_distribute_emission_zero_emission() {
24682451
0.into(),
24692452
AlphaCurrency::ZERO,
24702453
AlphaCurrency::ZERO,
2471-
AlphaCurrency::ZERO,
24722454
);
24732455

24742456
// Get the new stake of the hotkey.
@@ -2761,7 +2743,6 @@ fn test_drain_alpha_childkey_parentkey_with_burn() {
27612743
netuid,
27622744
pending_alpha,
27632745
AlphaCurrency::ZERO,
2764-
pending_alpha,
27652746
AlphaCurrency::ZERO,
27662747
);
27672748
let parent_stake_after = SubtensorModule::get_stake_for_hotkey_on_subnet(&parent, netuid);

0 commit comments

Comments
 (0)