Skip to content

Commit 904662c

Browse files
orriinorriin
committed
fix: fmt
1 parent 93de2c5 commit 904662c

File tree

9 files changed

+37
-30
lines changed

9 files changed

+37
-30
lines changed

‎node/src/command.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use node_subtensor_runtime::Block;
1717
use sc_cli::SubstrateCli;
1818
use sc_service::PartialComponents;
1919

20-
2120
impl SubstrateCli for Cli {
2221
fn impl_name() -> String {
2322
"Subtensor Node".into()

‎node/src/rpc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
use std::sync::Arc;
99

1010
use jsonrpsee::RpcModule;
11-
use node_subtensor_runtime::{opaque::Block, AccountId, Balance, BlockNumber, Index, Hash};
11+
use node_subtensor_runtime::{opaque::Block, AccountId, Balance, BlockNumber, Hash, Index};
12+
use sc_consensus_grandpa::FinalityProofProvider;
1213
use sc_transaction_pool_api::TransactionPool;
1314
use sp_api::ProvideRuntimeApi;
1415
use sp_block_builder::BlockBuilder;
1516
use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
16-
use sc_consensus_grandpa::FinalityProofProvider;
1717

1818
pub use sc_rpc_api::DenyUnsafe;
1919

@@ -64,9 +64,9 @@ where
6464
P: TransactionPool + 'static,
6565
{
6666
use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
67+
use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer};
6768
use substrate_frame_rpc_system::{System, SystemApiServer};
6869
use subtensor_custom_rpc::{SubtensorCustom, SubtensorCustomApiServer};
69-
use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer};
7070

7171
let mut module = RpcModule::new(());
7272
let FullDeps {
@@ -99,7 +99,7 @@ where
9999
justification_stream,
100100
finality_provider,
101101
)
102-
.into_rpc(),
102+
.into_rpc(),
103103
)?;
104104

105105
// Extend this RPC with a custom API by using the following syntax.

‎pallets/commitments/src/benchmarking.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::Pallet as Commitments;
77
use frame_benchmarking::v2::*;
88
use frame_system::RawOrigin;
99

10-
use sp_runtime::traits::{Bounded};
10+
use sp_runtime::traits::Bounded;
1111

1212
fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
1313
frame_system::Pallet::<T>::assert_last_event(generic_event.into());

‎pallets/subtensor/src/delegate_info.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ impl<T: Config> Pallet<T> {
9999

100100
pub fn get_delegates() -> Vec<DelegateInfo<T>> {
101101
let mut delegates = Vec::<DelegateInfo<T>>::new();
102-
for delegate in
103-
<Delegates<T> as IterableStorageMap<T::AccountId, u16>>::iter_keys()
104-
{
102+
for delegate in <Delegates<T> as IterableStorageMap<T::AccountId, u16>>::iter_keys() {
105103
let delegate_info = Self::get_delegate_by_existing_account(delegate.clone());
106104
delegates.push(delegate_info);
107105
}
@@ -118,9 +116,7 @@ impl<T: Config> Pallet<T> {
118116
T::AccountId::decode(&mut delegatee_account_vec.as_bytes_ref()).unwrap();
119117

120118
let mut delegates: Vec<(DelegateInfo<T>, Compact<u64>)> = Vec::new();
121-
for delegate in
122-
<Delegates<T> as IterableStorageMap<T::AccountId, u16>>::iter_keys()
123-
{
119+
for delegate in <Delegates<T> as IterableStorageMap<T::AccountId, u16>>::iter_keys() {
124120
let staked_to_this_delegatee =
125121
Self::get_stake_for_coldkey_and_hotkey(&delegatee.clone(), &delegate.clone());
126122
if staked_to_this_delegatee == 0 {

‎pallets/subtensor/src/math.rs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,9 @@ mod tests {
12241224
let target: Vec<u16> = vec![65535, 65535];
12251225
let result: Vec<u16> = vec_max_upscale_to_u16(&vector);
12261226
assert_vec_compare_u16(&result, &target);
1227-
let vector: Vec<I32F32> = vec_to_fixed(&[0.000001, 0.000006, 0.000007, 0.0001, 0.001, 0.01, 0.1, 0.2, 0.3, 0.4]);
1227+
let vector: Vec<I32F32> = vec_to_fixed(&[
1228+
0.000001, 0.000006, 0.000007, 0.0001, 0.001, 0.01, 0.1, 0.2, 0.3, 0.4,
1229+
]);
12281230
let target: Vec<u16> = vec![0, 1, 1, 16, 164, 1638, 16384, 32768, 49151, 65535];
12291231
let result: Vec<u16> = vec_max_upscale_to_u16(&vector);
12301232
assert_vec_compare_u16(&result, &target);
@@ -1618,25 +1620,29 @@ mod tests {
16181620
.iter()
16191621
.map(|t: &I32F32| sigmoid_safe(*t, I32F32::max_value(), I32F32::max_value()))
16201622
.collect();
1621-
let target: Vec<I32F32> = vec_to_fixed(&[0.0000000019,
1623+
let target: Vec<I32F32> = vec_to_fixed(&[
16221624
0.0000000019,
16231625
0.0000000019,
16241626
0.0000000019,
16251627
0.0000000019,
16261628
0.0000000019,
1627-
0.5]);
1629+
0.0000000019,
1630+
0.5,
1631+
]);
16281632
assert_eq!(&consensus, &target);
16291633
let consensus: Vec<I32F32> = trust
16301634
.iter()
16311635
.map(|t: &I32F32| sigmoid_safe(*t, I32F32::min_value(), I32F32::min_value()))
16321636
.collect();
1633-
let target: Vec<I32F32> = vec_to_fixed(&[0.5,
1637+
let target: Vec<I32F32> = vec_to_fixed(&[
1638+
0.5,
1639+
0.0000000019,
16341640
0.0000000019,
16351641
0.0000000019,
16361642
0.0000000019,
16371643
0.0000000019,
16381644
0.0000000019,
1639-
0.0000000019]);
1645+
]);
16401646
assert_eq!(&consensus, &target);
16411647
let consensus: Vec<I32F32> = trust
16421648
.iter()
@@ -1710,8 +1716,7 @@ mod tests {
17101716
true, false, true, false, true, false, true, false, true, false,
17111717
];
17121718
assert_eq!(&result, &target);
1713-
let vector: Vec<I32F32> =
1714-
vec_to_fixed(&[0.9, 0., 0.8, 0.1, 0.7, 0.2, 0.6, 0.3, 0.5, 0.4]);
1719+
let vector: Vec<I32F32> = vec_to_fixed(&[0.9, 0., 0.8, 0.1, 0.7, 0.2, 0.6, 0.3, 0.5, 0.4]);
17151720
let result = is_topk(&vector, 5);
17161721
let target: Vec<bool> = vec![
17171722
true, false, true, false, true, false, true, false, true, false,
@@ -2677,7 +2682,9 @@ mod tests {
26772682
);
26782683

26792684
let n: usize = 100;
2680-
for majority in vec_to_fixed(&[0., 0.0000001, 0.25, 0.49, 0.49, 0.49, 0.5, 0.51, 0.51, 0.51, 0.9999999, 1.]) {
2685+
for majority in vec_to_fixed(&[
2686+
0., 0.0000001, 0.25, 0.49, 0.49, 0.49, 0.5, 0.51, 0.51, 0.51, 0.9999999, 1.,
2687+
]) {
26812688
for allow_equal in [false, true] {
26822689
let mut stake: Vec<I32F32> = vec![];
26832690
let mut score: Vec<I32F32> = vec![];

‎pallets/subtensor/src/root.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,8 +681,7 @@ impl<T: Config> Pallet<T> {
681681
};
682682

683683
// --- 5. Perform the lock operation.
684-
let actual_lock_amount =
685-
Self::remove_balance_from_coldkey_account(&coldkey, lock_amount)?;
684+
let actual_lock_amount = Self::remove_balance_from_coldkey_account(&coldkey, lock_amount)?;
686685
Self::set_subnet_locked_balance(netuid_to_register, actual_lock_amount);
687686
Self::set_network_last_lock(actual_lock_amount);
688687

‎pallets/subtensor/src/stake_info.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ impl<T: Config> Pallet<T> {
5656
return Vec::new(); // Invalid coldkey
5757
}
5858

59-
60-
6159
Self::_get_stake_info_for_coldkeys(coldkeys)
6260
}
6361

@@ -71,7 +69,7 @@ impl<T: Config> Pallet<T> {
7169
let stake_info = Self::_get_stake_info_for_coldkeys(vec![coldkey]);
7270

7371
if stake_info.is_empty() {
74-
Vec::new()// Invalid coldkey
72+
Vec::new() // Invalid coldkey
7573
} else {
7674
return stake_info.first().unwrap().1.clone();
7775
}

‎pallets/subtensor/src/uids.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ impl<T: Config> Pallet<T> {
109109
netuid: u16,
110110
hotkey: &T::AccountId,
111111
) -> Result<u16, DispatchError> {
112-
Uids::<T>::try_get(netuid, hotkey)
113-
.map_err(|_err| Error::<T>::NotRegistered.into())
112+
Uids::<T>::try_get(netuid, hotkey).map_err(|_err| Error::<T>::NotRegistered.into())
114113
}
115114

116115
// Returns the stake of the uid on network or 0 if it doesnt exist.

‎pallets/subtensor/src/utils.rs‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,17 @@ impl<T: Config> Pallet<T> {
138138
pub fn set_target_stakes_per_interval(target_stakes_per_interval: u64) {
139139
TargetStakesPerInterval::<T>::set(target_stakes_per_interval)
140140
}
141-
pub fn set_stakes_this_interval_for_coldkey_hotkey(coldkey: &T::AccountId, hotkey: &T::AccountId, stakes_this_interval: u64, last_staked_block_number: u64) {
142-
TotalHotkeyColdkeyStakesThisInterval::<T>::insert(coldkey, hotkey, (stakes_this_interval, last_staked_block_number));
141+
pub fn set_stakes_this_interval_for_coldkey_hotkey(
142+
coldkey: &T::AccountId,
143+
hotkey: &T::AccountId,
144+
stakes_this_interval: u64,
145+
last_staked_block_number: u64,
146+
) {
147+
TotalHotkeyColdkeyStakesThisInterval::<T>::insert(
148+
coldkey,
149+
hotkey,
150+
(stakes_this_interval, last_staked_block_number),
151+
);
143152
}
144153
pub fn set_stake_interval(block: u64) {
145154
StakeInterval::<T>::set(block);
@@ -300,7 +309,7 @@ impl<T: Config> Pallet<T> {
300309
pub fn burn_tokens(amount: u64) {
301310
TotalIssuance::<T>::put(TotalIssuance::<T>::get().saturating_sub(amount));
302311
}
303-
pub fn coinbase(amount: u64 ){
312+
pub fn coinbase(amount: u64) {
304313
TotalIssuance::<T>::put(TotalIssuance::<T>::get().saturating_add(amount));
305314
}
306315
pub fn get_default_take() -> u16 {

0 commit comments

Comments
 (0)