working

Author: sam0x17

pallets/commitments/src/lib.rs

@@ -10,7 +10,7 @@ pub mod types;
 pub mod weights;
 
 pub use pallet::*;
-use subtensor_macros::freeze_struct_ignore_ra;
+use subtensor_macros::freeze_struct;
 pub use types::*;
 pub use weights::WeightInfo;
 
@@ -210,7 +210,7 @@ use {
     },
 };
 
-#[freeze_struct_ignore_ra("6a00398e14a8a984")]
+#[freeze_struct("6a00398e14a8a984")]
 #[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)]
 pub struct CommitmentsSignedExtension<T: Config + Send + Sync + TypeInfo>(pub PhantomData<T>);
 

pallets/commitments/src/types.rs

@@ -29,7 +29,7 @@ use sp_runtime::{
     RuntimeDebug,
 };
 use sp_std::{fmt::Debug, iter::once, prelude::*};
-use subtensor_macros::freeze_struct_ignore_ra;
+use subtensor_macros::freeze_struct;
 
 /// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
 /// than 32-bytes then it will be truncated when encoding.
@@ -284,12 +284,12 @@ impl Default for Data {
     }
 }
 
-#[freeze_struct_ignore_ra("1053e03f8a8f6a67")]
+#[freeze_struct("25c84048dcc90813")]
 #[derive(
     CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
 )]
 #[codec(mel_bound())]
-#[cfg_attr(test, derive(frame_support::DefaultNoBound))]
+#[derive(frame_support::DefaultNoBound)]
 #[scale_info(skip_type_params(FieldLimit))]
 pub struct CommitmentInfo<FieldLimit: Get<u32>> {
     pub fields: BoundedVec<Data, FieldLimit>,

pallets/registry/src/types.rs

@@ -30,7 +30,7 @@ use sp_runtime::{
     RuntimeDebug,
 };
 use sp_std::{fmt::Debug, iter::once, ops::Add, prelude::*};
-use subtensor_macros::freeze_struct_ignore_ra;
+use subtensor_macros::freeze_struct;
 
 /// Either underlying data blob if it is at most 32 bytes, or a hash of it. If the data is greater
 /// than 32-bytes then it will be truncated when encoding.
@@ -279,12 +279,12 @@ impl TypeInfo for IdentityFields {
 ///
 /// NOTE: This should be stored at the end of the storage item to facilitate the addition of extra
 /// fields in a backwards compatible way through a specialized `Decode` impl.
-#[freeze_struct_ignore_ra("fa02e2abde778fc4")]
+#[freeze_struct("70b183c8753429f1")]
 #[derive(
     CloneNoBound, Encode, Decode, Eq, MaxEncodedLen, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
 )]
 #[codec(mel_bound())]
-#[cfg_attr(test, derive(frame_support::DefaultNoBound))]
+#[derive(frame_support::DefaultNoBound)]
 #[scale_info(skip_type_params(FieldLimit))]
 pub struct IdentityInfo<FieldLimit: Get<u32>> {
     /// Additional fields of the identity that are not catered for with the struct's explicit

support/macros/build.rs

@@ -9,21 +9,19 @@ use visitor::*;
 /// Freezes the layout of a struct to the current hash of its fields, ensuring that future
 /// changes require updating the hash.
 ///
-/// If you ever get in a loop where rust analyzer insists that the hash is wrong each time you
-/// update, but `cargo check` is passing, you should use [`freeze_struct_ignore_ra`] instead.
+/// ```
+/// use subtensor_macros::freeze_struct;
+///
+/// #[freeze_struct("13f75e4ea46b4e80")]
+/// #[derive(Copy, Clone, PartialEq, Eq)]
+/// pub struct MyStruct {
+///     pub a: u32,
+///     pub b: u64,
+/// }
+/// ```
 #[proc_macro_attribute]
 pub fn freeze_struct(attr: TokenStream, tokens: TokenStream) -> TokenStream {
-    match freeze_struct_impl(attr, tokens, false) {
-        Ok(item_struct) => item_struct.to_token_stream().into(),
-        Err(err) => err.to_compile_error().into(),
-    }
-}
-
-/// More permissive version of [`freeze_struct`] that ignores the hash check when running in
-/// rust-analyzer since in some rare situations rust-analyzer will generate an incorrect hash code
-#[proc_macro_attribute]
-pub fn freeze_struct_ignore_ra(attr: TokenStream, tokens: TokenStream) -> TokenStream {
-    match freeze_struct_impl(attr, tokens, true) {
+    match freeze_struct_impl(attr, tokens) {
         Ok(item_struct) => item_struct.to_token_stream().into(),
         Err(err) => err.to_compile_error().into(),
     }
@@ -32,7 +30,6 @@ pub fn freeze_struct_ignore_ra(attr: TokenStream, tokens: TokenStream) -> TokenS
 fn freeze_struct_impl(
     attr: impl Into<TokenStream2>,
     tokens: impl Into<TokenStream2>,
-    ignore_ra: bool,
 ) -> Result<ItemStruct> {
     let attr = attr.into();
     let tokens = tokens.into();
@@ -49,16 +46,13 @@ fn freeze_struct_impl(
             expected hashcode: `#[freeze_struct(\"{calculated_hash_hex}\")]`"),
         ));
     }
-    let hash_lit = parse2::<LitStr>(attr)?;
-    let provided_hash_hex = hash_lit.value().to_lowercase();
+
+    let parsed_attr = parse2::<LitStr>(attr)?;
+    let provided_hash_hex = parsed_attr.value().to_lowercase();
 
     let mut visitor = CleanDocComments::new();
     visit_item_struct_mut(&mut visitor, &mut item_clone);
 
-    if ignore_ra && is_rust_analyzer() {
-        return Ok(item);
-    }
-
     if provided_hash_hex != calculated_hash_hex {
         return Err(Error::new_spanned(item,
             format!(
@@ -72,8 +66,3 @@ fn freeze_struct_impl(
     }
     Ok(item)
 }
-
-/// Returns true if the current build is being run by rust-analyzer.
-fn is_rust_analyzer() -> bool {
-    std::env!("RUSTC_WRAPPER").contains("rust-analyzer")
-}

support/macros/src/lib.rs

@@ -1,6 +1,6 @@
 use ahash::RandomState;
 use std::hash::{BuildHasher, Hash, Hasher};
-use syn::{self, parse_quote, visit_mut::VisitMut};
+use syn::{parse_quote, visit_mut::VisitMut};
 
 pub struct CleanDocComments;
 
@@ -12,7 +12,6 @@ impl CleanDocComments {
 
 impl VisitMut for CleanDocComments {
     fn visit_attribute_mut(&mut self, attr: &mut syn::Attribute) {
-        // Check if the attribute is a doc comment and remove it if it is
         if attr.path().is_ident("doc") {
             *attr = parse_quote!(#[doc = ""]);
         }