From 619ef06546441cf362aa82664e9f55e021751cd1 Mon Sep 17 00:00:00 2001 From: Sam Johnson Date: Tue, 10 Jun 2025 13:06:35 -0400 Subject: [PATCH 1/4] remove subnet exists check on validate_remove_stake --- pallets/subtensor/src/staking/stake_utils.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/subtensor/src/staking/stake_utils.rs b/pallets/subtensor/src/staking/stake_utils.rs index 2f9704a6b9..fe0eff1a05 100644 --- a/pallets/subtensor/src/staking/stake_utils.rs +++ b/pallets/subtensor/src/staking/stake_utils.rs @@ -965,7 +965,7 @@ impl Pallet { allow_partial: bool, ) -> Result<(), Error> { // Ensure that the subnet exists. - ensure!(Self::if_subnet_exist(netuid), Error::::SubnetNotExists); + // ensure!(Self::if_subnet_exist(netuid), Error::::SubnetNotExists); // Ensure that the subnet is enabled. Self::ensure_subtoken_enabled(netuid)?; From a69315bc5275818f8d89abf3497a3c3ea019d92b Mon Sep 17 00:00:00 2001 From: Sam Johnson Date: Tue, 10 Jun 2025 13:17:04 -0400 Subject: [PATCH 2/4] whoops, wrong line --- pallets/subtensor/src/staking/stake_utils.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pallets/subtensor/src/staking/stake_utils.rs b/pallets/subtensor/src/staking/stake_utils.rs index fe0eff1a05..78f9c245db 100644 --- a/pallets/subtensor/src/staking/stake_utils.rs +++ b/pallets/subtensor/src/staking/stake_utils.rs @@ -965,10 +965,10 @@ impl Pallet { allow_partial: bool, ) -> Result<(), Error> { // Ensure that the subnet exists. - // ensure!(Self::if_subnet_exist(netuid), Error::::SubnetNotExists); + ensure!(Self::if_subnet_exist(netuid), Error::::SubnetNotExists); // Ensure that the subnet is enabled. - Self::ensure_subtoken_enabled(netuid)?; + // Self::ensure_subtoken_enabled(netuid)?; // Ensure that the stake amount to be removed is above the minimum in tao equivalent. if let Some(tao_equivalent) = Self::sim_swap_alpha_for_tao(netuid, alpha_unstaked) { From 315dedcdfb1bc56263e5f4009a74a1cb3e332202 Mon Sep 17 00:00:00 2001 From: Sam Johnson Date: Tue, 10 Jun 2025 13:20:49 -0400 Subject: [PATCH 3/4] fix test --- pallets/subtensor/src/tests/subnet.rs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pallets/subtensor/src/tests/subnet.rs b/pallets/subtensor/src/tests/subnet.rs index fdcaa00222..10358076ed 100644 --- a/pallets/subtensor/src/tests/subnet.rs +++ b/pallets/subtensor/src/tests/subnet.rs @@ -340,17 +340,15 @@ fn test_subtoken_enable_reject_trading_before_enable() { stake_bal ); - assert_noop!( - SubtensorModule::remove_stake_limit( - RuntimeOrigin::signed(coldkey_account_id), - hotkey_account_id, - netuid, - amount, - limit_price, - false - ), - Error::::SubtokenDisabled - ); + SubtensorModule::remove_stake_limit( + RuntimeOrigin::signed(coldkey_account_id), + hotkey_account_id, + netuid, + amount, + limit_price, + false, + ) + .unwrap(); assert_noop!( SubtensorModule::remove_stake( From 5f552ae52d5b96ad9ba0cc23e0daabbc43f3e3a0 Mon Sep 17 00:00:00 2001 From: Sam Johnson Date: Tue, 10 Jun 2025 13:23:00 -0400 Subject: [PATCH 4/4] clippy --- pallets/subtensor/src/tests/subnet.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pallets/subtensor/src/tests/subnet.rs b/pallets/subtensor/src/tests/subnet.rs index 10358076ed..c95a841736 100644 --- a/pallets/subtensor/src/tests/subnet.rs +++ b/pallets/subtensor/src/tests/subnet.rs @@ -239,7 +239,9 @@ fn test_subtoken_enable() { }); } -// cargo test --package pallet-subtensor --lib -- tests::subnet::test_subtoken_enable_reject_trading_before_enable --exact --show-output +// cargo test --package pallet-subtensor --lib -- +// tests::subnet::test_subtoken_enable_reject_trading_before_enable --exact --show-output +#[allow(clippy::unwrap_used)] #[test] fn test_subtoken_enable_reject_trading_before_enable() { // ensure_subtoken_enabled