Skip to content

Commit 5acabf3

Browse files
LandynDevLandynDev
committed
cargo fmt
1 parent cb7470d commit 5acabf3

2 files changed

Lines changed: 122 additions & 38 deletions

File tree

‎chain-extensions/src/lib.rs‎

Lines changed: 88 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,12 @@ where
553553

554554
let caller = env.caller();
555555
if real_coldkey != caller {
556-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
557-
.map_err(|_| DispatchError::Other("NotProxy"))?;
556+
pallet_proxy::Pallet::<T>::find_proxy(
557+
&real_coldkey,
558+
&caller,
559+
Some(ProxyType::Staking),
560+
)
561+
.map_err(|_| DispatchError::Other("NotProxy"))?;
558562
}
559563

560564
let call_result = pallet_subtensor::Pallet::<T>::add_stake(
@@ -590,8 +594,12 @@ where
590594

591595
let caller = env.caller();
592596
if real_coldkey != caller {
593-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
594-
.map_err(|_| DispatchError::Other("NotProxy"))?;
597+
pallet_proxy::Pallet::<T>::find_proxy(
598+
&real_coldkey,
599+
&caller,
600+
Some(ProxyType::Staking),
601+
)
602+
.map_err(|_| DispatchError::Other("NotProxy"))?;
595603
}
596604

597605
let call_result = pallet_subtensor::Pallet::<T>::remove_stake(
@@ -622,8 +630,12 @@ where
622630

623631
let caller = env.caller();
624632
if real_coldkey != caller {
625-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
626-
.map_err(|_| DispatchError::Other("NotProxy"))?;
633+
pallet_proxy::Pallet::<T>::find_proxy(
634+
&real_coldkey,
635+
&caller,
636+
Some(ProxyType::Staking),
637+
)
638+
.map_err(|_| DispatchError::Other("NotProxy"))?;
627639
}
628640

629641
let call_result = pallet_subtensor::Pallet::<T>::unstake_all(
@@ -652,8 +664,12 @@ where
652664

653665
let caller = env.caller();
654666
if real_coldkey != caller {
655-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
656-
.map_err(|_| DispatchError::Other("NotProxy"))?;
667+
pallet_proxy::Pallet::<T>::find_proxy(
668+
&real_coldkey,
669+
&caller,
670+
Some(ProxyType::Staking),
671+
)
672+
.map_err(|_| DispatchError::Other("NotProxy"))?;
657673
}
658674

659675
let call_result = pallet_subtensor::Pallet::<T>::unstake_all_alpha(
@@ -683,14 +699,25 @@ where
683699
origin_netuid,
684700
destination_netuid,
685701
alpha_amount,
686-
): (T::AccountId, T::AccountId, T::AccountId, NetUid, NetUid, AlphaCurrency) = env
702+
): (
703+
T::AccountId,
704+
T::AccountId,
705+
T::AccountId,
706+
NetUid,
707+
NetUid,
708+
AlphaCurrency,
709+
) = env
687710
.read_as()
688711
.map_err(|_| DispatchError::Other("Failed to decode input parameters"))?;
689712

690713
let caller = env.caller();
691714
if real_coldkey != caller {
692-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
693-
.map_err(|_| DispatchError::Other("NotProxy"))?;
715+
pallet_proxy::Pallet::<T>::find_proxy(
716+
&real_coldkey,
717+
&caller,
718+
Some(ProxyType::Staking),
719+
)
720+
.map_err(|_| DispatchError::Other("NotProxy"))?;
694721
}
695722

696723
let call_result = pallet_subtensor::Pallet::<T>::move_stake(
@@ -717,7 +744,14 @@ where
717744

718745
env.charge_weight(weight)?;
719746

720-
let (real_coldkey, destination_coldkey, hotkey, origin_netuid, destination_netuid, alpha_amount): (
747+
let (
748+
real_coldkey,
749+
destination_coldkey,
750+
hotkey,
751+
origin_netuid,
752+
destination_netuid,
753+
alpha_amount,
754+
): (
721755
T::AccountId,
722756
T::AccountId,
723757
T::AccountId,
@@ -730,8 +764,12 @@ where
730764

731765
let caller = env.caller();
732766
if real_coldkey != caller {
733-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Transfer))
734-
.map_err(|_| DispatchError::Other("NotProxy"))?;
767+
pallet_proxy::Pallet::<T>::find_proxy(
768+
&real_coldkey,
769+
&caller,
770+
Some(ProxyType::Transfer),
771+
)
772+
.map_err(|_| DispatchError::Other("NotProxy"))?;
735773
}
736774

737775
let call_result = pallet_subtensor::Pallet::<T>::transfer_stake(
@@ -770,8 +808,12 @@ where
770808

771809
let caller = env.caller();
772810
if real_coldkey != caller {
773-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
774-
.map_err(|_| DispatchError::Other("NotProxy"))?;
811+
pallet_proxy::Pallet::<T>::find_proxy(
812+
&real_coldkey,
813+
&caller,
814+
Some(ProxyType::Staking),
815+
)
816+
.map_err(|_| DispatchError::Other("NotProxy"))?;
775817
}
776818

777819
let call_result = pallet_subtensor::Pallet::<T>::swap_stake(
@@ -810,8 +852,12 @@ where
810852

811853
let caller = env.caller();
812854
if real_coldkey != caller {
813-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
814-
.map_err(|_| DispatchError::Other("NotProxy"))?;
855+
pallet_proxy::Pallet::<T>::find_proxy(
856+
&real_coldkey,
857+
&caller,
858+
Some(ProxyType::Staking),
859+
)
860+
.map_err(|_| DispatchError::Other("NotProxy"))?;
815861
}
816862

817863
let call_result = pallet_subtensor::Pallet::<T>::add_stake_limit(
@@ -851,8 +897,12 @@ where
851897

852898
let caller = env.caller();
853899
if real_coldkey != caller {
854-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
855-
.map_err(|_| DispatchError::Other("NotProxy"))?;
900+
pallet_proxy::Pallet::<T>::find_proxy(
901+
&real_coldkey,
902+
&caller,
903+
Some(ProxyType::Staking),
904+
)
905+
.map_err(|_| DispatchError::Other("NotProxy"))?;
856906
}
857907

858908
let call_result = pallet_subtensor::Pallet::<T>::remove_stake_limit(
@@ -901,8 +951,12 @@ where
901951

902952
let caller = env.caller();
903953
if real_coldkey != caller {
904-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
905-
.map_err(|_| DispatchError::Other("NotProxy"))?;
954+
pallet_proxy::Pallet::<T>::find_proxy(
955+
&real_coldkey,
956+
&caller,
957+
Some(ProxyType::Staking),
958+
)
959+
.map_err(|_| DispatchError::Other("NotProxy"))?;
906960
}
907961

908962
let call_result = pallet_subtensor::Pallet::<T>::swap_stake_limit(
@@ -941,8 +995,12 @@ where
941995

942996
let caller = env.caller();
943997
if real_coldkey != caller {
944-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
945-
.map_err(|_| DispatchError::Other("NotProxy"))?;
998+
pallet_proxy::Pallet::<T>::find_proxy(
999+
&real_coldkey,
1000+
&caller,
1001+
Some(ProxyType::Staking),
1002+
)
1003+
.map_err(|_| DispatchError::Other("NotProxy"))?;
9461004
}
9471005

9481006
let call_result = pallet_subtensor::Pallet::<T>::remove_stake_full_limit(
@@ -973,8 +1031,12 @@ where
9731031

9741032
let caller = env.caller();
9751033
if real_coldkey != caller {
976-
pallet_proxy::Pallet::<T>::find_proxy(&real_coldkey, &caller, Some(ProxyType::Staking))
977-
.map_err(|_| DispatchError::Other("NotProxy"))?;
1034+
pallet_proxy::Pallet::<T>::find_proxy(
1035+
&real_coldkey,
1036+
&caller,
1037+
Some(ProxyType::Staking),
1038+
)
1039+
.map_err(|_| DispatchError::Other("NotProxy"))?;
9781040
}
9791041

9801042
let call_result = pallet_subtensor::Pallet::<T>::set_coldkey_auto_stake_hotkey(

‎chain-extensions/src/tests.rs‎

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,9 @@ fn remove_stake_v2_with_proxy_succeeds() {
11631163

11641164
let alpha_before =
11651165
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1166-
&hotkey, &real_coldkey, netuid,
1166+
&hotkey,
1167+
&real_coldkey,
1168+
netuid,
11671169
);
11681170

11691171
let alpha_to_unstake: AlphaCurrency = (alpha_before.to_u64() / 2).into();
@@ -1184,7 +1186,9 @@ fn remove_stake_v2_with_proxy_succeeds() {
11841186

11851187
let alpha_after =
11861188
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1187-
&hotkey, &real_coldkey, netuid,
1189+
&hotkey,
1190+
&real_coldkey,
1191+
netuid,
11881192
);
11891193

11901194
assert!(alpha_after < alpha_before);
@@ -1246,11 +1250,15 @@ fn swap_stake_v2_with_proxy_succeeds() {
12461250

12471251
let alpha_origin_before =
12481252
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1249-
&hotkey, &real_coldkey, netuid_a,
1253+
&hotkey,
1254+
&real_coldkey,
1255+
netuid_a,
12501256
);
12511257
let alpha_destination_before =
12521258
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1253-
&hotkey, &real_coldkey, netuid_b,
1259+
&hotkey,
1260+
&real_coldkey,
1261+
netuid_b,
12541262
);
12551263
let alpha_to_swap: AlphaCurrency = (alpha_origin_before.to_u64() / 3).into();
12561264

@@ -1270,11 +1278,15 @@ fn swap_stake_v2_with_proxy_succeeds() {
12701278

12711279
let alpha_origin_after =
12721280
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1273-
&hotkey, &real_coldkey, netuid_a,
1281+
&hotkey,
1282+
&real_coldkey,
1283+
netuid_a,
12741284
);
12751285
let alpha_destination_after =
12761286
pallet_subtensor::Pallet::<mock::Test>::get_stake_for_hotkey_and_coldkey_on_subnet(
1277-
&hotkey, &real_coldkey, netuid_b,
1287+
&hotkey,
1288+
&real_coldkey,
1289+
netuid_b,
12781290
);
12791291

12801292
assert!(alpha_origin_after < alpha_origin_before);
@@ -1448,7 +1460,10 @@ fn transfer_stake_v2_requires_transfer_proxy() {
14481460
.with_expected_weight(expected_weight);
14491461

14501462
let ret = SubtensorChainExtension::<mock::Test>::dispatch(&mut env);
1451-
assert!(ret.is_err(), "Staking proxy should not work for transfer_stake");
1463+
assert!(
1464+
ret.is_err(),
1465+
"Staking proxy should not work for transfer_stake"
1466+
);
14521467

14531468
// Remove Staking proxy, add Transfer proxy
14541469
assert_ok!(pallet_subtensor_proxy::Pallet::<mock::Test>::remove_proxy(
@@ -1539,8 +1554,12 @@ fn unstake_all_v2_self_call_succeeds() {
15391554

15401555
let pre_balance = pallet_subtensor::Pallet::<mock::Test>::get_coldkey_balance(&coldkey);
15411556

1542-
let mut env = MockEnv::new(FunctionId::UnstakeAllV2, coldkey, (coldkey, hotkey).encode())
1543-
.with_expected_weight(expected_weight);
1557+
let mut env = MockEnv::new(
1558+
FunctionId::UnstakeAllV2,
1559+
coldkey,
1560+
(coldkey, hotkey).encode(),
1561+
)
1562+
.with_expected_weight(expected_weight);
15441563

15451564
let ret = SubtensorChainExtension::<mock::Test>::dispatch(&mut env).unwrap();
15461565
assert_success(ret);
@@ -1593,9 +1612,12 @@ fn unstake_all_alpha_v2_self_call_succeeds() {
15931612
.saturating_add(<mock::Test as frame_system::Config>::DbWeight::get().reads(37))
15941613
.saturating_add(<mock::Test as frame_system::Config>::DbWeight::get().writes(21));
15951614

1596-
let mut env =
1597-
MockEnv::new(FunctionId::UnstakeAllAlphaV2, coldkey, (coldkey, hotkey).encode())
1598-
.with_expected_weight(expected_weight);
1615+
let mut env = MockEnv::new(
1616+
FunctionId::UnstakeAllAlphaV2,
1617+
coldkey,
1618+
(coldkey, hotkey).encode(),
1619+
)
1620+
.with_expected_weight(expected_weight);
15991621

16001622
let ret = SubtensorChainExtension::<mock::Test>::dispatch(&mut env).unwrap();
16011623
assert_success(ret);

0 commit comments

Comments
 (0)