Reformat

Cargo.toml

@@ -87,9 +87,6 @@ quote = "1"
 proc-macro2 = { version = "1", features = ["span-locations"] }
 walkdir = "2"
 
-<<<<<<< HEAD
-subtensor-macros = { path = "support/macros" }
-
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
 frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
@@ -99,17 +96,6 @@ frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "
 frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
-=======
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
->>>>>>> aa3cf981 (Restructure workspace)
 
 pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }

node/build.rs

@@ -5,5 +5,5 @@ fn main() {
     rerun_if_git_head_changed();
 
     println!("cargo:rerun-if-changed=src");
-	subtensor_linting::walk_src();
+    subtensor_linting::walk_src();
 }

pallets/subtensor/src/rpc_info/delegate_info.rs

@@ -7,7 +7,7 @@ extern crate alloc;
 use codec::Compact;
 use sp_core::hexdisplay::AsBytesRef;
 
-#[freeze_struct("5752e4c650a83e0d")]
+// #[freeze_struct("5752e4c650a83e0d")]
 #[derive(Decode, Encode, PartialEq, Eq, Clone, Debug)]
 pub struct DelegateInfo<T: Config> {
     delegate_ss58: T::AccountId,

support/code-coverage/src/main.rs

@@ -2,7 +2,7 @@ use std::env;
 use std::path::PathBuf;
 
 fn main() {
-	// should we instead provide an argument to set the directory?
+    // should we instead provide an argument to set the directory?
     let source_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let mut source_dir = PathBuf::from(&source_dir);
     source_dir.pop();

support/linting/src/lib.rs

@@ -1,17 +1,14 @@
 pub mod lint;
 pub use lint::*;
 
+mod disallow_v1_benchmarks;
 mod forbid_as_primitive;
 mod forbid_keys_remove;
 mod pallet_index;
 mod require_freeze_struct;
 
+pub use disallow_v1_benchmarks::DisallowV1Benchmarks;
 pub use forbid_as_primitive::ForbidAsPrimitiveConversion;
 pub use forbid_keys_remove::ForbidKeysRemoveCall;
-mod disallow_v1_benchmarks;
-mod pallet_index;
-mod require_freeze_struct;
-
-pub use disallow_v1_benchmarks::DisallowV1Benchmarks;
 pub use pallet_index::RequireExplicitPalletIndex;
 pub use require_freeze_struct::RequireFreezeStruct;

support/linting/src/lint.rs

@@ -1,12 +1,12 @@
-use proc_macro2::TokenTree;
-use syn::{Attribute, File, Meta, MetaList, Path};
 use std::env;
 use std::path::{Path, PathBuf};
 use std::sync::mpsc;
 use std::{fs, str::FromStr};
 
+use proc_macro2::TokenTree;
+use syn::{Attribute, File, Meta, MetaList, Path as SynPath};
+
 use rayon::prelude::*;
-use syn::File;
 use walkdir::WalkDir;
 
 use crate::{
@@ -31,7 +31,7 @@ pub fn is_allowed(attibutes: &[Attribute]) -> bool {
         let Attribute {
             meta:
                 Meta::List(MetaList {
-                    path: Path { segments: attr, .. },
+                    path: SynPath { segments: attr, .. },
                     tokens: attr_args,
                     ..
                 }),