encode error from basic features migration to new proxy and unified syntax

contracts/feature-tests/basic-features/src/basic_features_main.rs

@@ -12,6 +12,7 @@ pub mod crypto_features;
 pub mod echo;
 pub mod echo_managed;
 pub mod elliptic_curve_features;
+pub mod encode_error_proxy;
 pub mod event_features;
 pub mod macro_features;
 pub mod managed_address_features;

contracts/feature-tests/basic-features/src/codec_err_test.rs

@@ -1,19 +1,5 @@
 multiversx_sc::imports!();
-use crate::types::CodecErrorTestType;
-
-mod encode_err_proxy {
-    multiversx_sc::imports!();
-    use crate::types::CodecErrorTestType;
-
-    #[multiversx_sc::proxy]
-    pub trait EncodeErrorProxy {
-        #[init]
-        fn init(&self, error_arg: CodecErrorTestType);
-
-        #[endpoint]
-        fn encode_error_method(&self, error_arg: CodecErrorTestType);
-    }
-}
+use crate::{encode_error_proxy, types::CodecErrorTestType};
 
 /// Test various serialization errors.
 #[multiversx_sc::module]
@@ -62,24 +48,24 @@ pub trait CodecErrorTest {
     fn codec_err_event_data(&self) {
         self.event_err_data(CodecErrorTestType);
     }
-
-    #[proxy]
-    fn encode_err_proxy(&self) -> encode_err_proxy::Proxy<Self::Api>;
-
     /// Never actually calls any deploy/upgrade, so it is appropriate in this contract.
     /// It just covers contract init serialization errors.
     #[endpoint]
     fn codec_err_contract_init(&self) {
-        let _ = self.encode_err_proxy().init(CodecErrorTestType);
+        let _ = self
+            .tx()
+            .typed(encode_error_proxy::EncodeErrorProxy)
+            .init(CodecErrorTestType);
     }
 
     /// Never actually calls any async/sync call, so it is appropriate in this contract.
     /// It just covers contract call serialization errors.
     #[endpoint]
     fn codec_err_contract_call(&self) {
         let _ = self
-            .encode_err_proxy()
-            .contract(ManagedAddress::zero())
+            .tx()
+            .to(&ManagedAddress::zero())
+            .typed(encode_error_proxy::EncodeErrorProxy)
             .encode_error_method(CodecErrorTestType);
     }
 }

contracts/feature-tests/basic-features/src/encode_error_proxy.rs

@@ -0,0 +1,100 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+use crate::types::CodecErrorTestType;
+
+pub struct EncodeErrorProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for EncodeErrorProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = EncodeErrorProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        EncodeErrorProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, Gas> EncodeErrorProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn init<
+        Arg0: CodecInto<CodecErrorTestType>,
+    >(
+        self,
+        error_arg: Arg0,
+    ) -> TxProxyDeploy<Env, From, Gas, ()> {
+        self.wrapped_tx
+            .raw_deploy()
+            .argument(&error_arg)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade(
+        self,
+    ) -> TxProxyUpgrade<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> EncodeErrorProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn encode_error_method<
+        Arg0: CodecInto<CodecErrorTestType>,
+    >(
+        self,
+        error_arg: Arg0,
+    ) -> TxProxyCall<Env, From, To, Gas, ()> {
+        self.wrapped_tx
+            .raw_call()
+            .function_name("encode_error_method")
+            .argument(&error_arg)
+            .original_result()
+    }
+}