From 96a414af84aa2f12b1e8646432ec909e518d1928 Mon Sep 17 00:00:00 2001
From: Andrei Marinica <andrei.marinica@multiversx.com>
Date: Thu, 12 Dec 2024 16:34:02 +0200
Subject: [PATCH] ContractObj wraps UniversalContractObj

---
 framework/derive/src/generate/snippets.rs     | 20 +++++++------------
 .../scenario/tests/contract_without_macros.rs | 17 ++++++----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/framework/derive/src/generate/snippets.rs b/framework/derive/src/generate/snippets.rs
index 91fc8a863f..64c590ad5f 100644
--- a/framework/derive/src/generate/snippets.rs
+++ b/framework/derive/src/generate/snippets.rs
@@ -1,11 +1,8 @@
 pub fn contract_object_def() -> proc_macro2::TokenStream {
     quote! {
-        pub struct ContractObj<A>
-        where
-            A: multiversx_sc::api::VMApi,
-        {
-            _phantom: core::marker::PhantomData<A>,
-        }
+    pub struct ContractObj<A>(multiversx_sc::contract_base::UniversalContractObj<A>)
+    where
+        A: multiversx_sc::api::VMApi;
     }
 }
 
@@ -26,9 +23,7 @@ pub fn new_contract_object_fn() -> proc_macro2::TokenStream {
         where
             A: multiversx_sc::api::VMApi,
         {
-            ContractObj {
-                _phantom: core::marker::PhantomData,
-            }
+            ContractObj::<A>(multiversx_sc::contract_base::UniversalContractObj::<A>::new())
         }
 
         pub struct ContractBuilder;
@@ -36,10 +31,9 @@ pub fn new_contract_object_fn() -> proc_macro2::TokenStream {
         impl multiversx_sc::contract_base::CallableContractBuilder for self::ContractBuilder {
             fn new_contract_obj<A: multiversx_sc::api::VMApi + Send + Sync>(
                 &self,
-            ) -> multiversx_sc::types::heap::Box<dyn multiversx_sc::contract_base::CallableContract> {
-                multiversx_sc::types::heap::Box::new(ContractObj::<A> {
-                    _phantom: core::marker::PhantomData,
-                })
+            ) -> multiversx_sc::types::heap::Box<dyn multiversx_sc::contract_base::CallableContract>
+            {
+                multiversx_sc::types::heap::Box::new(self::contract_obj::<A>())
             }
         }
     }
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index 29189bf898..d0da5fac52 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -592,12 +592,9 @@ mod sample_adder {
     /////////////////////////////////////////////////////////////////////////////////////////////////
     //////// CONTRACT OBJECT ////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////
-    pub struct ContractObj<A>
+    pub struct ContractObj<A>(multiversx_sc::contract_base::UniversalContractObj<A>)
     where
-        A: multiversx_sc::api::VMApi,
-    {
-        _phantom: core::marker::PhantomData<A>,
-    }
+        A: multiversx_sc::api::VMApi;
 
     /////////////////////////////////////////////////////////////////////////////////////////////////
     //////// CONTRACT OBJECT as CONTRACT BASE ///////////////////////////////////////////////////////
@@ -633,19 +630,17 @@ mod sample_adder {
     where
         A: multiversx_sc::api::VMApi,
     {
-        ContractObj {
-            _phantom: core::marker::PhantomData,
-        }
+        ContractObj::<A>(multiversx_sc::contract_base::UniversalContractObj::<A>::new())
     }
+
     pub struct ContractBuilder;
+
     impl multiversx_sc::contract_base::CallableContractBuilder for self::ContractBuilder {
         fn new_contract_obj<A: multiversx_sc::api::VMApi + Send + Sync>(
             &self,
         ) -> multiversx_sc::types::heap::Box<dyn multiversx_sc::contract_base::CallableContract>
         {
-            multiversx_sc::types::heap::Box::new(ContractObj::<A> {
-                _phantom: core::marker::PhantomData,
-            })
+            multiversx_sc::types::heap::Box::new(self::contract_obj::<A>())
         }
     }