Move contracts imports to prelude.

commit-id:357a8f6c
starkware-libs · Jul 2, 2024 · 502331b · 502331b
1 parent 313e3cb
commit 502331b
Show file tree

Hide file tree

Showing 27 changed files with 12 additions and 389 deletions.
diff --git a/corelib/src/prelude/v2023_01.cairo b/corelib/src/prelude/v2023_01.cairo
@@ -100,3 +100,9 @@ use core::{zeroable, zeroable::{NonZero, Zeroable}};
 #[cfg(test)]
 use core::test;
 pub use core::ops::Deref;
+
+
+pub use starknet::storage::{
+    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, StoragePointerReadAccess,
+    StoragePointerWriteAccess
+};
diff --git a/corelib/src/prelude/v2023_10.cairo b/corelib/src/prelude/v2023_10.cairo
@@ -63,3 +63,8 @@ pub use core::traits::Index;
 pub use core::traits::IndexView;
 pub use core::zeroable::NonZero;
 pub use core::ops::Deref;
+
+pub use starknet::storage::{
+    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, StoragePointerReadAccess,
+    StoragePointerWriteAccess
+};
diff --git a/crates/cairo-lang-starknet/cairo_level_tests/cairo_project.toml b/crates/cairo-lang-starknet/cairo_level_tests/cairo_project.toml
@@ -2,4 +2,4 @@
 cairo_level_tests = "."
 
 [config.global]
-edition = "2023_10"
+edition = "2023_11"
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component
@@ -625,10 +625,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/diagnostics
@@ -102,10 +102,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -281,10 +277,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -460,10 +452,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -635,10 +623,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -810,10 +794,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -989,10 +969,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -1164,10 +1140,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -1335,10 +1307,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -1518,10 +1486,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -1746,10 +1710,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",
@@ -1925,10 +1885,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as
@@ -438,10 +438,6 @@ pub fn component_state_for_testing<TContractState>() -> ComponentState<TContract
 }
 
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",

diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract
@@ -162,10 +162,6 @@ pub fn contract_state_for_testing() -> ContractState {
     unsafe_new_contract_state()
 }
 
-use starknet::storage::{
-    StorageMapReadAccessTrait, StorageMapWriteAccessTrait, 
-    StorableStoragePointerReadAccess, StorableStoragePointerWriteAccess
-};
 // TODO(Gil): This generates duplicate diagnostics because of the plugin system, squash the duplicates into one.
 #[deprecated(
     feature: "deprecated_legacy_map",