diff --git a/pallets/subtensor/src/benchmarks.rs b/pallets/subtensor/src/benchmarks.rs index fd49b9a6b2..d04328cd0d 100644 --- a/pallets/subtensor/src/benchmarks.rs +++ b/pallets/subtensor/src/benchmarks.rs @@ -1405,7 +1405,7 @@ mod pallet_benchmarks { seed_swap_reserves::(netuid); Subtensor::::add_balance_to_coldkey_account(&coldkey, reg_balance.into()); - assert_ok!(Subtensor::::do_burned_registration( + assert_ok!(Subtensor::::burned_register( RawOrigin::Signed(coldkey.clone()).into(), netuid, old.clone() diff --git a/pallets/subtensor/src/migrations/migrate_clear_deprecated_registration_maps.rs b/pallets/subtensor/src/migrations/migrate_clear_deprecated_registration_maps.rs index 645f7c6d1c..4d062699e6 100644 --- a/pallets/subtensor/src/migrations/migrate_clear_deprecated_registration_maps.rs +++ b/pallets/subtensor/src/migrations/migrate_clear_deprecated_registration_maps.rs @@ -38,11 +38,6 @@ pub fn migrate_clear_deprecated_registration_maps() -> 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" @@ -55,15 +50,6 @@ pub fn migrate_clear_deprecated_registration_maps() -> 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::::insert(&migration_name, true); weight = weight.saturating_add(T::DbWeight::get().writes(1)); diff --git a/pallets/subtensor/src/tests/migration.rs b/pallets/subtensor/src/tests/migration.rs index 914a5321f2..368851846b 100644 --- a/pallets/subtensor/src/tests/migration.rs +++ b/pallets/subtensor/src/tests/migration.rs @@ -3173,59 +3173,23 @@ fn test_migrate_clear_deprecated_registration_maps() { assert_eq!(crate::BurnIncreaseMult::::get(netuid1), 11u64); // Seed deprecated storage items that the migration is expected to clear. - crate::Difficulty::::insert(netuid0, 123u64); - crate::MinDifficulty::::insert(netuid0, 10u64); - crate::MaxDifficulty::::insert(netuid0, 999u64); crate::NetworkPowRegistrationAllowed::::insert(netuid0, true); crate::POWRegistrationsThisInterval::::insert(netuid0, 7u16); crate::BurnRegistrationsThisInterval::::insert(netuid0, 8u16); - crate::AdjustmentAlpha::::insert(netuid0, 55u64); - crate::AdjustmentInterval::::insert(netuid0, 11u16); - crate::LastAdjustmentBlock::::insert(netuid0, 88u64); - - crate::MinBurn::::insert(netuid0, TaoBalance::from(1_000_000_000u64)); - crate::MaxBurn::::insert(netuid0, TaoBalance::from(2_000_000_000u64)); - - crate::Difficulty::::insert(netuid1, 321u64); - crate::MinDifficulty::::insert(netuid1, 20u64); - crate::MaxDifficulty::::insert(netuid1, 777u64); crate::NetworkPowRegistrationAllowed::::insert(netuid1, false); crate::POWRegistrationsThisInterval::::insert(netuid1, 17u16); crate::BurnRegistrationsThisInterval::::insert(netuid1, 18u16); - crate::AdjustmentAlpha::::insert(netuid1, 155u64); - crate::AdjustmentInterval::::insert(netuid1, 21u16); - crate::LastAdjustmentBlock::::insert(netuid1, 188u64); - - crate::MinBurn::::insert(netuid1, TaoBalance::from(3_000_000_000u64)); - crate::MaxBurn::::insert(netuid1, TaoBalance::from(4_000_000_000u64)); - - assert!(crate::Difficulty::::contains_key(netuid0)); - assert!(crate::MinDifficulty::::contains_key(netuid0)); - assert!(crate::MaxDifficulty::::contains_key(netuid0)); assert!(crate::NetworkPowRegistrationAllowed::::contains_key(netuid0)); assert!(crate::POWRegistrationsThisInterval::::contains_key(netuid0)); assert!(crate::BurnRegistrationsThisInterval::::contains_key(netuid0)); - assert!(crate::AdjustmentAlpha::::contains_key(netuid0)); - assert!(crate::AdjustmentInterval::::contains_key(netuid0)); - assert!(crate::LastAdjustmentBlock::::contains_key(netuid0)); - assert!(crate::MinBurn::::contains_key(netuid0)); - assert!(crate::MaxBurn::::contains_key(netuid0)); - - assert!(crate::Difficulty::::contains_key(netuid1)); - assert!(crate::MinDifficulty::::contains_key(netuid1)); - assert!(crate::MaxDifficulty::::contains_key(netuid1)); + assert!(crate::NetworkPowRegistrationAllowed::::contains_key(netuid1)); assert!(crate::POWRegistrationsThisInterval::::contains_key(netuid1)); assert!(crate::BurnRegistrationsThisInterval::::contains_key(netuid1)); - assert!(crate::AdjustmentAlpha::::contains_key(netuid1)); - assert!(crate::AdjustmentInterval::::contains_key(netuid1)); - assert!(crate::LastAdjustmentBlock::::contains_key(netuid1)); - assert!(crate::MinBurn::::contains_key(netuid1)); - assert!(crate::MaxBurn::::contains_key(netuid1)); // -------------------------------------------------------------------- // 1) Run migration @@ -3241,29 +3205,13 @@ fn test_migrate_clear_deprecated_registration_maps() { "migration flag should be true after run" ); - assert!(!crate::Difficulty::::contains_key(netuid0)); - assert!(!crate::MinDifficulty::::contains_key(netuid0)); - assert!(!crate::MaxDifficulty::::contains_key(netuid0)); assert!(!crate::NetworkPowRegistrationAllowed::::contains_key(netuid0)); assert!(!crate::POWRegistrationsThisInterval::::contains_key(netuid0)); assert!(!crate::BurnRegistrationsThisInterval::::contains_key(netuid0)); - assert!(!crate::AdjustmentAlpha::::contains_key(netuid0)); - assert!(!crate::AdjustmentInterval::::contains_key(netuid0)); - assert!(!crate::LastAdjustmentBlock::::contains_key(netuid0)); - assert!(!crate::MinBurn::::contains_key(netuid0)); - assert!(!crate::MaxBurn::::contains_key(netuid0)); - - assert!(!crate::Difficulty::::contains_key(netuid1)); - assert!(!crate::MinDifficulty::::contains_key(netuid1)); - assert!(!crate::MaxDifficulty::::contains_key(netuid1)); + assert!(!crate::NetworkPowRegistrationAllowed::::contains_key(netuid1)); assert!(!crate::POWRegistrationsThisInterval::::contains_key(netuid1)); assert!(!crate::BurnRegistrationsThisInterval::::contains_key(netuid1)); - assert!(!crate::AdjustmentAlpha::::contains_key(netuid1)); - assert!(!crate::AdjustmentInterval::::contains_key(netuid1)); - assert!(!crate::LastAdjustmentBlock::::contains_key(netuid1)); - assert!(!crate::MinBurn::::contains_key(netuid1)); - assert!(!crate::MaxBurn::::contains_key(netuid1)); // -------------------------------------------------------------------- // 3) Post-state: new-model storage unchanged