Skip to content

Commit ccceb75

Browse files
committed
Merge branch 'devnet-ready' into selective-metagraph
2 parents e88256a + eb9549f commit ccceb75

File tree

7 files changed

+962
-141
lines changed

7 files changed

+962
-141
lines changed

pallets/admin-utils/src/tests/mock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ parameter_types! {
8686
pub const InitialImmunityPeriod: u16 = 2;
8787
pub const InitialMaxAllowedUids: u16 = 2;
8888
pub const InitialBondsMovingAverage: u64 = 900_000;
89-
pub const InitialBondsPenalty: u16 = 0;
89+
pub const InitialBondsPenalty: u16 = u16::MAX;
9090
pub const InitialStakePruningMin: u16 = 0;
9191
pub const InitialFoundationDistribution: u64 = 0;
9292
pub const InitialDefaultDelegateTake: u16 = 11_796; // 18% honest number.

pallets/subtensor/src/coinbase/run_coinbase.rs

+206-70
Large diffs are not rendered by default.

pallets/subtensor/src/tests/children.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3382,17 +3382,17 @@ fn test_dividend_distribution_with_children() {
33823382
"C should have pending emission of 1/9 of total emission"
33833383
);
33843384

3385-
let dividends_a = SubtensorModule::get_dividends_distribution(
3385+
let dividends_a = SubtensorModule::get_parent_child_dividends_distribution(
33863386
&hotkey_a,
33873387
netuid,
33883388
hardcoded_emission.saturating_to_num::<u64>(),
33893389
);
3390-
let dividends_b = SubtensorModule::get_dividends_distribution(
3390+
let dividends_b = SubtensorModule::get_parent_child_dividends_distribution(
33913391
&hotkey_b,
33923392
netuid,
33933393
hardcoded_emission.saturating_to_num::<u64>(),
33943394
);
3395-
let dividends_c = SubtensorModule::get_dividends_distribution(
3395+
let dividends_c = SubtensorModule::get_parent_child_dividends_distribution(
33963396
&hotkey_c,
33973397
netuid,
33983398
hardcoded_emission.saturating_to_num::<u64>(),
@@ -3883,12 +3883,12 @@ fn test_dividend_distribution_with_children_same_coldkey_owner() {
38833883
);
38843884

38853885
// Get the distribution of dividends including the Parent/Child relationship.
3886-
let dividends_a = SubtensorModule::get_dividends_distribution(
3886+
let dividends_a = SubtensorModule::get_parent_child_dividends_distribution(
38873887
&hotkey_a,
38883888
netuid,
38893889
hardcoded_emission.saturating_to_num::<u64>(),
38903890
);
3891-
let dividends_b = SubtensorModule::get_dividends_distribution(
3891+
let dividends_b = SubtensorModule::get_parent_child_dividends_distribution(
38923892
&hotkey_b,
38933893
netuid,
38943894
hardcoded_emission.saturating_to_num::<u64>(),

0 commit comments

Comments
 (0)