Extract offer result in separate function.

multiversx · Oct 2, 2023 · 67c4e00 · 67c4e00
1 parent 6a181ea
commit 67c4e00
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 28 deletions.
diff --git a/contracts/nft-escrow/Cargo.toml b/contracts/nft-escrow/Cargo.toml
@@ -8,11 +8,8 @@ publish = false
 [lib]
 path = "src/lib.rs"
 
-[dev-dependencies]
-num-bigint = "0.4.2"
-
 [dependencies.multiversx-sc]
-version = "0.41.1"
+version = "0.43.4"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.41.1"
+version = "0.43.4"
diff --git a/contracts/nft-escrow/meta/Cargo.toml b/contracts/nft-escrow/meta/Cargo.toml
@@ -11,4 +11,4 @@ authors = [ "you",]
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.41.1"
+version = "0.43.4"
diff --git a/contracts/nft-escrow/src/lib.rs b/contracts/nft-escrow/src/lib.rs
@@ -143,7 +143,7 @@ pub trait NftEscrowContract {
         let mut result = MultiValueEncoded::new();
 
         for offer_id in self.created_offers(&address).iter() {
-            result.push(MultiValue2::from((offer_id, self.offers(offer_id).get())));
+            result.push(self.get_offer_result(offer_id));
         }
 
         result
@@ -157,12 +157,19 @@ pub trait NftEscrowContract {
         let mut result = MultiValueEncoded::new();
 
         for offer_id in self.wanted_offers(&address).iter() {
-            result.push(MultiValue2::from((offer_id, self.offers(offer_id).get())));
+            result.push(self.get_offer_result(offer_id));
         }
 
         result
     }
 
+    fn get_offer_result(&self, offer_id: u32) -> MultiValue2<u32, Offer<Self::Api>> {
+        let offer = self.offers(offer_id).get();
+        let offer_result = MultiValue2::from((offer_id, offer));
+
+        offer_result
+    }
+
     #[view]
     #[storage_mapper("createdOffers")]
     fn created_offers(&self, address: &ManagedAddress) -> UnorderedSetMapper<u32>;

diff --git a/contracts/nft-escrow/wasm/Cargo.lock b/contracts/nft-escrow/wasm/Cargo.lock
diff --git a/contracts/nft-escrow/wasm/Cargo.toml b/contracts/nft-escrow/wasm/Cargo.toml
@@ -24,4 +24,4 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.41.1"
+version = "0.43.4"
diff --git a/contracts/nft-escrow/wasm/src/lib.rs b/contracts/nft-escrow/wasm/src/lib.rs
@@ -10,6 +10,9 @@
 // Total number of exported functions:  10
 
 #![no_std]
+
+// Configuration that works with rustc < 1.73.0.
+// TODO: Recommended rustc version: 1.73.0 or newer.
 #![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
@@ -18,15 +21,16 @@ multiversx_sc_wasm_adapter::panic_handler!();
 multiversx_sc_wasm_adapter::endpoints! {
     nft_escrow
     (
-        escrow
-        cancel
-        accept
-        getCreatedOffers
-        getWantedOffers
-        created_offers
-        wanted_offers
-        offers
+        init => init
+        escrow => escrow
+        cancel => cancel
+        accept => accept
+        getCreatedOffers => get_created_offers
+        getWantedOffers => get_wanted_offers
+        created_offers => created_offers
+        wanted_offers => wanted_offers
+        offers => offers
     )
 }
 
-multiversx_sc_wasm_adapter::empty_callback! {}
+multiversx_sc_wasm_adapter::async_callback_empty! {}