Move OdraItem trait to odra-types crate (#227)

odradev · Oct 16, 2023 · fb4c665 · fb4c665
1 parent 5394b59
commit fb4c665
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 72 deletions.
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -21,7 +21,6 @@ compile_error!(
 );
 
 mod instance;
-mod item;
 mod list;
 mod mapping;
 #[cfg(not(target_arch = "wasm32"))]
@@ -62,7 +61,6 @@ pub mod prelude {
 
 pub use {
     instance::{DynamicInstance, StaticInstance},
-    item::OdraItem,
     list::{Iter, List},
     mapping::Mapping,
     odra_proc_macros::{

diff --git a/examples/resources/nested_mapping_schema.json b/examples/resources/nested_mapping_schema.json
@@ -118,23 +118,6 @@
     }
   ],
   "events": [
-    {
-      "name": "OwnershipTransferred",
-      "fields": [
-        {
-          "name": "previous_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        },
-        {
-          "name": "new_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        }
-      ]
-    },
     {
       "name": "Approval",
       "fields": [
@@ -152,6 +135,23 @@
         }
       ]
     },
+    {
+      "name": "OwnershipTransferred",
+      "fields": [
+        {
+          "name": "previous_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        },
+        {
+          "name": "new_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        }
+      ]
+    },
     {
       "name": "Transfer",
       "fields": [

diff --git a/examples/resources/owned_token_schema.json b/examples/resources/owned_token_schema.json
@@ -157,23 +157,6 @@
     }
   ],
   "events": [
-    {
-      "name": "OwnershipTransferred",
-      "fields": [
-        {
-          "name": "previous_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        },
-        {
-          "name": "new_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        }
-      ]
-    },
     {
       "name": "Approval",
       "fields": [
@@ -191,6 +174,23 @@
         }
       ]
     },
+    {
+      "name": "OwnershipTransferred",
+      "fields": [
+        {
+          "name": "previous_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        },
+        {
+          "name": "new_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        }
+      ]
+    },
     {
       "name": "Transfer",
       "fields": [

diff --git a/examples/resources/token_manager_schema.json b/examples/resources/token_manager_schema.json
@@ -88,23 +88,6 @@
     }
   ],
   "events": [
-    {
-      "name": "OwnershipTransferred",
-      "fields": [
-        {
-          "name": "previous_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        },
-        {
-          "name": "new_owner",
-          "ty": {
-            "Option": "Key"
-          }
-        }
-      ]
-    },
     {
       "name": "Approval",
       "fields": [
@@ -122,6 +105,23 @@
         }
       ]
     },
+    {
+      "name": "OwnershipTransferred",
+      "fields": [
+        {
+          "name": "previous_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        },
+        {
+          "name": "new_owner",
+          "ty": {
+            "Option": "Key"
+          }
+        }
+      ]
+    },
     {
       "name": "Transfer",
       "fields": [

diff --git a/examples/src/contracts/balance_checker.rs b/examples/src/contracts/balance_checker.rs
@@ -19,7 +19,7 @@ pub trait Token {
 mod tests {
     use super::*;
     use crate::contracts::owned_token::tests;
-    use odra::{test_env, OdraItem};
+    use odra::{test_env, types::OdraItem};
 
     #[test]
     fn balance_checker() {

diff --git a/lang/codegen/src/generator/module_item.rs b/lang/codegen/src/generator/module_item.rs
@@ -37,7 +37,7 @@ impl GenerateCode for ModuleStruct<'_> {
 
             #node
 
-            impl odra::OdraItem for #struct_ident {
+            impl odra::types::OdraItem for #struct_ident {
                 fn is_module() -> bool {
                     true
                 }
@@ -54,10 +54,10 @@ impl GenerateCode for ModuleStruct<'_> {
                         events.insert(<#module_events as odra::types::event::OdraEvent>::schema());
                     )*
                     #(
-                        events.extend(<#submodules_events as odra::OdraItem>::events());
+                        events.extend(<#submodules_events as odra::types::OdraItem>::events());
                     )*
                     #(
-                        events.extend(<#mappings_events as odra::OdraItem>::events());
+                        events.extend(<#mappings_events as odra::types::OdraItem>::events());
                     )*
                     events.iter().map(Clone::clone).collect::<odra::prelude::vec::Vec<_>>()
                 }
@@ -144,7 +144,7 @@ mod test {
                 }
             }
 
-            impl odra::OdraItem for Module {
+            impl odra::types::OdraItem for Module {
                 fn is_module() -> bool {
                     true
                 }
@@ -162,10 +162,10 @@ mod test {
                     events.insert(<A as odra::types::event::OdraEvent>::schema());
                     events.insert(<B as odra::types::event::OdraEvent>::schema());
                     events.insert(<C as odra::types::event::OdraEvent>::schema());
-                    events.extend(<Submodule as odra::OdraItem>::events());
-                    events.extend(<MappedModule as odra::OdraItem>::events());
-                    events.extend(<odra::prelude::string::String as odra::OdraItem>::events());
-                    events.extend(<odra::types::U256 as odra::OdraItem>::events());
+                    events.extend(<Submodule as odra::types::OdraItem>::events());
+                    events.extend(<MappedModule as odra::types::OdraItem>::events());
+                    events.extend(<odra::prelude::string::String as odra::types::OdraItem>::events());
+                    events.extend(<odra::types::U256 as odra::types::OdraItem>::events());
                     events.iter().map(Clone::clone).collect::<odra::prelude::vec::Vec<_>>()
                 }
             }

diff --git a/lang/codegen/src/generator/odra_type_item/mod.rs b/lang/codegen/src/generator/odra_type_item/mod.rs
@@ -25,7 +25,7 @@ impl GenerateCode for OdraTypeItem<'_> {
 
             #clone_code
 
-            impl odra::OdraItem for #ident {
+            impl odra::types::OdraItem for #ident {
                 fn is_module() -> bool {
                     false
                 }

diff --git a/core/src/item.rs → types/src/item.rs b/core/src/item.rs → types/src/item.rs
@@ -1,19 +1,17 @@
-use odra_types::{
-    casper_types::{
-        bytesrepr::{FromBytes, ToBytes},
-        U128, U256, U512
-    },
-    Address
+use alloc::{collections::BTreeMap, string::String, vec::Vec};
+use casper_types::{
+    bytesrepr::{FromBytes, ToBytes},
+    U128, U256, U512
 };
 
-use crate::prelude::{collections::BTreeMap, string::String, vec::Vec};
+use crate::Address;
 
 pub trait OdraItem {
     fn is_module() -> bool;
 
     #[cfg(not(target_arch = "wasm32"))]
-    fn events() -> Vec<odra_types::contract_def::Event> {
-        crate::prelude::vec![]
+    fn events() -> Vec<crate::contract_def::Event> {
+        alloc::vec![]
     }
 }
 

diff --git a/types/src/lib.rs b/types/src/lib.rs
@@ -10,6 +10,7 @@ pub mod arithmetic;
 pub mod contract_def;
 mod error;
 pub mod event;
+mod item;
 pub mod uints;
 
 use alloc::vec::Vec;
@@ -22,6 +23,7 @@ pub use address::{Address, OdraAddress};
 pub use casper_types;
 pub use casper_types::{CLType, CLTyped, PublicKey, U128, U256, U512};
 pub use error::{AddressError, CollectionError, ExecutionError, OdraError, VmError};
+pub use item::OdraItem;
 
 pub trait UncheckedGetter {
     fn get<T: FromBytes + CLTyped>(&self, key: &str) -> T;