Skip to content

Commit 5ab12c0

Browse files
authored
Merge pull request #2561 from opentensor/fix-registration-migration
Fix Registration Migration
2 parents f6210c1 + 3b95c65 commit 5ab12c0

3 files changed

Lines changed: 3 additions & 69 deletions

File tree

pallets/subtensor/src/benchmarks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ mod pallet_benchmarks {
14051405
seed_swap_reserves::<T>(netuid);
14061406
Subtensor::<T>::add_balance_to_coldkey_account(&coldkey, reg_balance.into());
14071407

1408-
assert_ok!(Subtensor::<T>::do_burned_registration(
1408+
assert_ok!(Subtensor::<T>::burned_register(
14091409
RawOrigin::Signed(coldkey.clone()).into(),
14101410
netuid,
14111411
old.clone()

pallets/subtensor/src/migrations/migrate_clear_deprecated_registration_maps.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ pub fn migrate_clear_deprecated_registration_maps<T: Config>() -> Weight {
3838
}
3939
}};
4040
}
41-
42-
// PoW path (deprecated)
43-
clear_map_and_log!(Difficulty, "Difficulty");
44-
clear_map_and_log!(MinDifficulty, "MinDifficulty");
45-
clear_map_and_log!(MaxDifficulty, "MaxDifficulty");
4641
clear_map_and_log!(
4742
NetworkPowRegistrationAllowed,
4843
"NetworkPowRegistrationAllowed"
@@ -55,15 +50,6 @@ pub fn migrate_clear_deprecated_registration_maps<T: Config>() -> Weight {
5550
"BurnRegistrationsThisInterval"
5651
);
5752

58-
// Old adjustment mechanism (deprecated)
59-
clear_map_and_log!(AdjustmentAlpha, "AdjustmentAlpha");
60-
clear_map_and_log!(AdjustmentInterval, "AdjustmentInterval");
61-
clear_map_and_log!(LastAdjustmentBlock, "LastAdjustmentBlock");
62-
63-
// Burn bounds (deprecated, not part of the new model)
64-
clear_map_and_log!(MinBurn, "MinBurn");
65-
clear_map_and_log!(MaxBurn, "MaxBurn");
66-
6753
// --- 2) Mark migration done
6854
HasMigrationRun::<T>::insert(&migration_name, true);
6955
weight = weight.saturating_add(T::DbWeight::get().writes(1));

pallets/subtensor/src/tests/migration.rs

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3173,59 +3173,23 @@ fn test_migrate_clear_deprecated_registration_maps() {
31733173
assert_eq!(crate::BurnIncreaseMult::<Test>::get(netuid1), 11u64);
31743174

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

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

3184-
crate::AdjustmentAlpha::<Test>::insert(netuid0, 55u64);
3185-
crate::AdjustmentInterval::<Test>::insert(netuid0, 11u16);
3186-
crate::LastAdjustmentBlock::<Test>::insert(netuid0, 88u64);
3187-
3188-
crate::MinBurn::<Test>::insert(netuid0, TaoBalance::from(1_000_000_000u64));
3189-
crate::MaxBurn::<Test>::insert(netuid0, TaoBalance::from(2_000_000_000u64));
3190-
3191-
crate::Difficulty::<Test>::insert(netuid1, 321u64);
3192-
crate::MinDifficulty::<Test>::insert(netuid1, 20u64);
3193-
crate::MaxDifficulty::<Test>::insert(netuid1, 777u64);
31943181
crate::NetworkPowRegistrationAllowed::<Test>::insert(netuid1, false);
31953182

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

3199-
crate::AdjustmentAlpha::<Test>::insert(netuid1, 155u64);
3200-
crate::AdjustmentInterval::<Test>::insert(netuid1, 21u16);
3201-
crate::LastAdjustmentBlock::<Test>::insert(netuid1, 188u64);
3202-
3203-
crate::MinBurn::<Test>::insert(netuid1, TaoBalance::from(3_000_000_000u64));
3204-
crate::MaxBurn::<Test>::insert(netuid1, TaoBalance::from(4_000_000_000u64));
3205-
3206-
assert!(crate::Difficulty::<Test>::contains_key(netuid0));
3207-
assert!(crate::MinDifficulty::<Test>::contains_key(netuid0));
3208-
assert!(crate::MaxDifficulty::<Test>::contains_key(netuid0));
32093186
assert!(crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid0));
32103187
assert!(crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid0));
32113188
assert!(crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid0));
3212-
assert!(crate::AdjustmentAlpha::<Test>::contains_key(netuid0));
3213-
assert!(crate::AdjustmentInterval::<Test>::contains_key(netuid0));
3214-
assert!(crate::LastAdjustmentBlock::<Test>::contains_key(netuid0));
3215-
assert!(crate::MinBurn::<Test>::contains_key(netuid0));
3216-
assert!(crate::MaxBurn::<Test>::contains_key(netuid0));
3217-
3218-
assert!(crate::Difficulty::<Test>::contains_key(netuid1));
3219-
assert!(crate::MinDifficulty::<Test>::contains_key(netuid1));
3220-
assert!(crate::MaxDifficulty::<Test>::contains_key(netuid1));
3189+
32213190
assert!(crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid1));
32223191
assert!(crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid1));
32233192
assert!(crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid1));
3224-
assert!(crate::AdjustmentAlpha::<Test>::contains_key(netuid1));
3225-
assert!(crate::AdjustmentInterval::<Test>::contains_key(netuid1));
3226-
assert!(crate::LastAdjustmentBlock::<Test>::contains_key(netuid1));
3227-
assert!(crate::MinBurn::<Test>::contains_key(netuid1));
3228-
assert!(crate::MaxBurn::<Test>::contains_key(netuid1));
32293193

32303194
// --------------------------------------------------------------------
32313195
// 1) Run migration
@@ -3241,29 +3205,13 @@ fn test_migrate_clear_deprecated_registration_maps() {
32413205
"migration flag should be true after run"
32423206
);
32433207

3244-
assert!(!crate::Difficulty::<Test>::contains_key(netuid0));
3245-
assert!(!crate::MinDifficulty::<Test>::contains_key(netuid0));
3246-
assert!(!crate::MaxDifficulty::<Test>::contains_key(netuid0));
32473208
assert!(!crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid0));
32483209
assert!(!crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid0));
32493210
assert!(!crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid0));
3250-
assert!(!crate::AdjustmentAlpha::<Test>::contains_key(netuid0));
3251-
assert!(!crate::AdjustmentInterval::<Test>::contains_key(netuid0));
3252-
assert!(!crate::LastAdjustmentBlock::<Test>::contains_key(netuid0));
3253-
assert!(!crate::MinBurn::<Test>::contains_key(netuid0));
3254-
assert!(!crate::MaxBurn::<Test>::contains_key(netuid0));
3255-
3256-
assert!(!crate::Difficulty::<Test>::contains_key(netuid1));
3257-
assert!(!crate::MinDifficulty::<Test>::contains_key(netuid1));
3258-
assert!(!crate::MaxDifficulty::<Test>::contains_key(netuid1));
3211+
32593212
assert!(!crate::NetworkPowRegistrationAllowed::<Test>::contains_key(netuid1));
32603213
assert!(!crate::POWRegistrationsThisInterval::<Test>::contains_key(netuid1));
32613214
assert!(!crate::BurnRegistrationsThisInterval::<Test>::contains_key(netuid1));
3262-
assert!(!crate::AdjustmentAlpha::<Test>::contains_key(netuid1));
3263-
assert!(!crate::AdjustmentInterval::<Test>::contains_key(netuid1));
3264-
assert!(!crate::LastAdjustmentBlock::<Test>::contains_key(netuid1));
3265-
assert!(!crate::MinBurn::<Test>::contains_key(netuid1));
3266-
assert!(!crate::MaxBurn::<Test>::contains_key(netuid1));
32673215

32683216
// --------------------------------------------------------------------
32693217
// 3) Post-state: new-model storage unchanged

0 commit comments

Comments
 (0)