Merge branch 'master' into release-52-1

multiversx · Aug 1, 2024 · 67d6f46 · 67d6f46
2 parents 49bc839 + 94f4353
commit 67d6f46
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json
@@ -394,11 +394,15 @@
             "mutability": "readonly",
             "inputs": [
                 {
-                    "name": "_arg",
+                    "name": "arg",
                     "type": "AbiWithManagedBufferReadToEnd"
                 }
             ],
-            "outputs": []
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
         },
         {
             "name": "payable_egld",

diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -378,12 +378,12 @@ where
         Arg0: ProxyArg<AbiWithManagedBufferReadToEnd<Env::Api>>,
     >(
         self,
-        _arg: Arg0,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        arg: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("takes_object_with_managed_buffer_read_to_end")
-            .argument(&_arg)
+            .argument(&arg)
             .original_result()
     }
 

diff --git a/contracts/feature-tests/abi-tester/src/abi_tester.rs b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -175,8 +175,9 @@ pub trait AbiTester {
     #[view]
     fn takes_object_with_managed_buffer_read_to_end(
         &self,
-        _arg: AbiWithManagedBufferReadToEnd<Self::Api>,
-    ) {
+        arg: AbiWithManagedBufferReadToEnd<Self::Api>,
+    ) -> ManagedBuffer {
+        arg.flush.to_managed_buffer()
     }
 
     #[endpoint]

diff --git a/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -18,6 +18,11 @@ impl<M: ManagedTypeApi> ManagedBufferReadToEnd<M> {
     pub fn new_from_buf(buf: ManagedBuffer<M>) -> Self {
         Self { buffer: buf }
     }
+
+    #[inline]
+    pub fn to_managed_buffer(&self) -> ManagedBuffer<M> {
+        self.buffer.clone()
+    }
 }
 
 impl<M: ManagedTypeApi> PartialEq for ManagedBufferReadToEnd<M> {