Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pallets/subtensor/src/benchmarks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@ mod pallet_benchmarks {
seed_swap_reserves::<T>(netuid);
Subtensor::<T>::add_balance_to_coldkey_account(&coldkey, reg_balance.into());

assert_ok!(Subtensor::<T>::do_burned_registration(
assert_ok!(Subtensor::<T>::burned_register(
RawOrigin::Signed(coldkey.clone()).into(),
netuid,
old.clone()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ pub fn migrate_clear_deprecated_registration_maps<T: Config>() -> Weight {
}
}};
}

// PoW path (deprecated)
clear_map_and_log!(Difficulty, "Difficulty");
clear_map_and_log!(MinDifficulty, "MinDifficulty");
clear_map_and_log!(MaxDifficulty, "MaxDifficulty");
clear_map_and_log!(
NetworkPowRegistrationAllowed,
"NetworkPowRegistrationAllowed"
Expand All @@ -55,15 +50,6 @@ pub fn migrate_clear_deprecated_registration_maps<T: Config>() -> Weight {
"BurnRegistrationsThisInterval"
);

// Old adjustment mechanism (deprecated)
clear_map_and_log!(AdjustmentAlpha, "AdjustmentAlpha");
clear_map_and_log!(AdjustmentInterval, "AdjustmentInterval");
clear_map_and_log!(LastAdjustmentBlock, "LastAdjustmentBlock");

// Burn bounds (deprecated, not part of the new model)
clear_map_and_log!(MinBurn, "MinBurn");
clear_map_and_log!(MaxBurn, "MaxBurn");

// --- 2) Mark migration done
HasMigrationRun::<T>::insert(&migration_name, true);
weight = weight.saturating_add(T::DbWeight::get().writes(1));
Expand Down
56 changes: 2 additions & 54 deletions pallets/subtensor/src/tests/migration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3173,59 +3173,23 @@ fn test_migrate_clear_deprecated_registration_maps() {
assert_eq!(crate::BurnIncreaseMult::<Test>::get(netuid1), 11u64);

// Seed deprecated storage items that the migration is expected to clear.
crate::Difficulty::<Test>::insert(netuid0, 123u64);
crate::MinDifficulty::<Test>::insert(netuid0, 10u64);
crate::MaxDifficulty::<Test>::insert(netuid0, 999u64);
crate::NetworkPowRegistrationAllowed::<Test>::insert(netuid0, true);

crate::POWRegistrationsThisInterval::<Test>::insert(netuid0, 7u16);
crate::BurnRegistrationsThisInterval::<Test>::insert(netuid0, 8u16);

crate::AdjustmentAlpha::<Test>::insert(netuid0, 55u64);
crate::AdjustmentInterval::<Test>::insert(netuid0, 11u16);
crate::LastAdjustmentBlock::<Test>::insert(netuid0, 88u64);

crate::MinBurn::<Test>::insert(netuid0, TaoBalance::from(1_000_000_000u64));
crate::MaxBurn::<Test>::insert(netuid0, TaoBalance::from(2_000_000_000u64));

crate::Difficulty::<Test>::insert(netuid1, 321u64);
crate::MinDifficulty::<Test>::insert(netuid1, 20u64);
crate::MaxDifficulty::<Test>::insert(netuid1, 777u64);
crate::NetworkPowRegistrationAllowed::<Test>::insert(netuid1, false);

crate::POWRegistrationsThisInterval::<Test>::insert(netuid1, 17u16);
crate::BurnRegistrationsThisInterval::<Test>::insert(netuid1, 18u16);

crate::AdjustmentAlpha::<Test>::insert(netuid1, 155u64);
crate::AdjustmentInterval::<Test>::insert(netuid1, 21u16);
crate::LastAdjustmentBlock::<Test>::insert(netuid1, 188u64);

crate::MinBurn::<Test>::insert(netuid1, TaoBalance::from(3_000_000_000u64));
crate::MaxBurn::<Test>::insert(netuid1, TaoBalance::from(4_000_000_000u64));

assert!(crate::Difficulty::<Test>::contains_key(netuid0));
assert!(crate::MinDifficulty::<Test>::contains_key(netuid0));
assert!(crate::MaxDifficulty::<Test>::contains_key(netuid0));
assert!(crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid0));
assert!(crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid0));
assert!(crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid0));
assert!(crate::AdjustmentAlpha::<Test>::contains_key(netuid0));
assert!(crate::AdjustmentInterval::<Test>::contains_key(netuid0));
assert!(crate::LastAdjustmentBlock::<Test>::contains_key(netuid0));
assert!(crate::MinBurn::<Test>::contains_key(netuid0));
assert!(crate::MaxBurn::<Test>::contains_key(netuid0));

assert!(crate::Difficulty::<Test>::contains_key(netuid1));
assert!(crate::MinDifficulty::<Test>::contains_key(netuid1));
assert!(crate::MaxDifficulty::<Test>::contains_key(netuid1));

assert!(crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid1));
assert!(crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid1));
assert!(crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid1));
assert!(crate::AdjustmentAlpha::<Test>::contains_key(netuid1));
assert!(crate::AdjustmentInterval::<Test>::contains_key(netuid1));
assert!(crate::LastAdjustmentBlock::<Test>::contains_key(netuid1));
assert!(crate::MinBurn::<Test>::contains_key(netuid1));
assert!(crate::MaxBurn::<Test>::contains_key(netuid1));

// --------------------------------------------------------------------
// 1) Run migration
Expand All @@ -3241,29 +3205,13 @@ fn test_migrate_clear_deprecated_registration_maps() {
"migration flag should be true after run"
);

assert!(!crate::Difficulty::<Test>::contains_key(netuid0));
assert!(!crate::MinDifficulty::<Test>::contains_key(netuid0));
assert!(!crate::MaxDifficulty::<Test>::contains_key(netuid0));
assert!(!crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid0));
assert!(!crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid0));
assert!(!crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid0));
assert!(!crate::AdjustmentAlpha::<Test>::contains_key(netuid0));
assert!(!crate::AdjustmentInterval::<Test>::contains_key(netuid0));
assert!(!crate::LastAdjustmentBlock::<Test>::contains_key(netuid0));
assert!(!crate::MinBurn::<Test>::contains_key(netuid0));
assert!(!crate::MaxBurn::<Test>::contains_key(netuid0));

assert!(!crate::Difficulty::<Test>::contains_key(netuid1));
assert!(!crate::MinDifficulty::<Test>::contains_key(netuid1));
assert!(!crate::MaxDifficulty::<Test>::contains_key(netuid1));

assert!(!crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid1));
assert!(!crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid1));
assert!(!crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid1));
assert!(!crate::AdjustmentAlpha::<Test>::contains_key(netuid1));
assert!(!crate::AdjustmentInterval::<Test>::contains_key(netuid1));
assert!(!crate::LastAdjustmentBlock::<Test>::contains_key(netuid1));
assert!(!crate::MinBurn::<Test>::contains_key(netuid1));
assert!(!crate::MaxBurn::<Test>::contains_key(netuid1));

// --------------------------------------------------------------------
// 3) Post-state: new-model storage unchanged
Expand Down
Loading