Fixing derive StorageAccess naming. (#3672)

starkware-libs · Jul 13, 2023 · 5bf4ba3 · 5bf4ba3
1 parent d8da820
commit 5bf4ba3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/corelib/src/integer.cairo b/corelib/src/integer.cairo
@@ -1059,7 +1059,7 @@ impl U64BitOr of BitOr<u64> {
     }
 }
 
-#[derive(Copy, Drop, PartialEq, Serde, storage_access::StorageAccess)]
+#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageAccess)]
 struct u256 {
     low: u128,
     high: u128,

diff --git a/corelib/src/starknet/eth_address.cairo b/corelib/src/starknet/eth_address.cairo
@@ -6,7 +6,7 @@ use traits::{Into, TryInto};
 use zeroable::Zeroable;
 
 // An Ethereum address (160 bits).
-#[derive(Copy, Drop, storage_access::StorageAccess)]
+#[derive(Copy, Drop, starknet::StorageAccess)]
 struct EthAddress {
     address: felt252, 
 }

diff --git a/corelib/src/starknet/secp256_trait.cairo b/corelib/src/starknet/secp256_trait.cairo
@@ -7,7 +7,7 @@ use traits::{Into, TryInto};
 use integer::U256TryIntoNonZero;
 
 /// Secp256{k/r}1 ECDSA signature.
-#[derive(Copy, Drop, PartialEq, Serde, storage_access::StorageAccess)]
+#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageAccess)]
 struct Signature {
     r: u256,
     s: u256,

diff --git a/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo b/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo
@@ -19,14 +19,14 @@ impl StorageAddressPartialEq of PartialEq<StorageAddress> {
     }
 }
 
-#[derive(Drop, Serde, PartialEq, Copy, storage_access::StorageAccess)]
+#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageAccess)]
 struct Abc {
     a: u8,
     b: u16,
     c: u32,
 }
 
-#[derive(Drop, Serde, PartialEq, Copy, storage_access::StorageAccess)]
+#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageAccess)]
 struct AbcEtc {
     a: u8,
     b: u16,

diff --git a/crates/cairo-lang-starknet/src/plugin/dispatcher.rs b/crates/cairo-lang-starknet/src/plugin/dispatcher.rs
@@ -205,7 +205,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $dispatcher_signatures$
             }}
 
-            #[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
             struct {contract_caller_name} {{
                 contract_address: starknet::ContractAddress,
             }}
@@ -214,7 +214,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $contract_caller_method_impls$
             }}
 
-            #[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
             struct {library_caller_name} {{
                 class_hash: starknet::ClassHash,
             }}
@@ -227,7 +227,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $safe_dispatcher_signatures$
             }}
 
-            #[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
             struct {safe_library_caller_name} {{
                 class_hash: starknet::ClassHash,
             }}
@@ -238,7 +238,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             }}
 
 
-            #[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
             struct {safe_contract_caller_name} {{
                 contract_address: starknet::ContractAddress,
             }}

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher
@@ -36,7 +36,7 @@ trait IContractDispatcherTrait<T> {
     fn empty(self: T, );
 }
 
-#[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
 struct IContractDispatcher {
     contract_address: starknet::ContractAddress,
 }
@@ -73,7 +73,7 @@ impl IContractDispatcherImpl of IContractDispatcherTrait<IContractDispatcher> {
 
 }
 
-#[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
 struct IContractLibraryDispatcher {
     class_hash: starknet::ClassHash,
 }
@@ -115,7 +115,7 @@ trait IContractSafeDispatcherTrait<T> {
     fn empty(self: T, ) -> starknet::SyscallResult<()>;
 }
 
-#[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
 struct IContractSafeLibraryDispatcher {
     class_hash: starknet::ClassHash,
 }
@@ -155,7 +155,7 @@ impl IContractSafeLibraryDispatcherImpl of IContractSafeDispatcherTrait<IContrac
 }
 
 
-#[derive(Copy, Drop, storage_access::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
 struct IContractSafeDispatcher {
     contract_address: starknet::ContractAddress,
 }

diff --git a/crates/cairo-lang-starknet/src/plugin/storage_access.rs b/crates/cairo-lang-starknet/src/plugin/storage_access.rs
@@ -169,8 +169,7 @@ pub fn derive_storage_access_needed<T: QueryAttrs>(with_attrs: &T, db: &dyn Synt
             else {
                 continue;
             };
-            if path.as_syntax_node().get_text_without_trivia(db) == "storage_access::StorageAccess"
-            {
+            if path.as_syntax_node().get_text_without_trivia(db) == "starknet::StorageAccess" {
                 return true;
             }
         }

diff --git a/tests/bug_samples/issue3345.cairo b/tests/bug_samples/issue3345.cairo
@@ -1,4 +1,4 @@
-#[derive(Copy, Drop, storage_access::StorageAccess)]
+#[derive(Copy, Drop, starknet::StorageAccess)]
 struct Node {
     left: u128,
     right: u128