Armani Ferrante 3 năm trước cách đây
mục cha
commit
ecd6daf609
2 tập tin đã thay đổi với 12 bổ sung13 xóa
  1. 12 12
      lang/attribute/account/src/lib.rs
  2. 0 1
      lang/common/src/header.rs

+ 12 - 12
lang/attribute/account/src/lib.rs

@@ -88,6 +88,18 @@ pub fn account(
     let account_name = &account_strct.ident;
     let (impl_gen, type_gen, where_clause) = account_strct.generics.split_for_impl();
 
+    let discriminator: proc_macro2::TokenStream = {
+        let discriminator = anchor_common::header::create_discriminator(
+            &account_name.to_string(),
+            if namespace.is_empty() {
+                None
+            } else {
+                Some(&namespace)
+            },
+        );
+        format!("{:?}", discriminator).parse().unwrap()
+    };
+
     let owner_impl = {
         if namespace.is_empty() {
             quote! {
@@ -103,18 +115,6 @@ pub fn account(
         }
     };
 
-    let discriminator: proc_macro2::TokenStream = {
-        let discriminator = anchor_common::header::create_discriminator(
-            &account_name.to_string(),
-            if namespace.is_empty() {
-                None
-            } else {
-                Some(&namespace)
-            },
-        );
-        format!("{:?}", discriminator).parse().unwrap()
-    };
-
     let disc_fn = {
         let len: proc_macro2::TokenStream = anchor_common::header::discriminator_len_str()
             .parse()

+ 0 - 1
lang/common/src/header.rs

@@ -30,7 +30,6 @@ pub fn create_discriminator(account_name: &str, namespace: Option<&str>) -> [u8;
     discriminator
 }
 
-// Header is 8 bytes regardless of layout.
 pub fn read_data(account_data: &[u8]) -> &[u8] {
     &account_data[HEADER_LEN..]
 }