From 4e038e6e5b48c746b45d54b76f7b537624fd1734 Mon Sep 17 00:00:00 2001
From: dragosrebegea <dragos.rebegea@multiversx.com>
Date: Fri, 19 Jul 2024 10:34:06 +0300
Subject: [PATCH] rename storage mapper

---
 bridge-proxy/src/bridge-proxy.rs |  2 +-
 bridge-proxy/src/config.rs       | 21 +++++++++------------
 bridge-proxy/wasm/src/lib.rs     |  4 ++--
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/bridge-proxy/src/bridge-proxy.rs b/bridge-proxy/src/bridge-proxy.rs
index a7d08c0a..eea51a82 100644
--- a/bridge-proxy/src/bridge-proxy.rs
+++ b/bridge-proxy/src/bridge-proxy.rs
@@ -70,7 +70,7 @@ pub trait BridgeProxyContract:
 
     fn refund_transaction(&self, tx_id: usize, token_id: &TokenIdentifier, amount: &BigUint) {
         let tx = self.get_pending_transaction_by_id(tx_id);
-        let esdt_safe_addr = self.esdt_safe_address().get();
+        let esdt_safe_addr = self.bridged_tokens_wrapper_address().get();
 
         self.tx()
             .to(esdt_safe_addr)
diff --git a/bridge-proxy/src/config.rs b/bridge-proxy/src/config.rs
index f27ca837..ee909961 100644
--- a/bridge-proxy/src/config.rs
+++ b/bridge-proxy/src/config.rs
@@ -23,17 +23,17 @@ pub trait ConfigModule {
     }
 
     #[only_owner]
-    #[endpoint(setupEsdtSafe)]
-    fn set_esdt_safe_contract_address(&self, opt_esdt_safe_address: OptionalValue<ManagedAddress>) {
-        match opt_esdt_safe_address {
+    #[endpoint(setBridgedTokensWrapper)]
+    fn set_bridged_tokens_wrapper(&self, opt_address: OptionalValue<ManagedAddress>) {
+        match opt_address {
             OptionalValue::Some(sc_addr) => {
                 require!(
                     self.blockchain().is_smart_contract(&sc_addr),
-                    "Invalid multi-transfer address"
+                    "Invalid bridged tokens wrapper address"
                 );
-                self.esdt_safe_address().set(&sc_addr);
+                self.bridged_tokens_wrapper_address().set(&sc_addr);
             }
-            OptionalValue::None => self.esdt_safe_address().clear(),
+            OptionalValue::None => self.bridged_tokens_wrapper_address().clear(),
         }
     }
 
@@ -41,12 +41,9 @@ pub trait ConfigModule {
     #[storage_mapper("multiTransferAddress")]
     fn multi_transfer_address(&self) -> SingleValueMapper<ManagedAddress>;
 
-    #[view(getEsdtSafeAddress)]
-    #[storage_mapper("esdtSafeAddress")]
-    fn esdt_safe_address(&self) -> SingleValueMapper<ManagedAddress>;
-
-    #[proxy]
-    fn esdt_safe_proxy(&self, sc_address: ManagedAddress) -> esdt_safe::Proxy<Self::Api>;
+    #[view(getBridgedTokensWrapperAddress)]
+    #[storage_mapper("bridgedTokensWrapperAddress")]
+    fn bridged_tokens_wrapper_address(&self) -> SingleValueMapper<ManagedAddress>;
 
     #[storage_mapper("pending_transactions")]
     fn pending_transactions(&self) -> VecMapper<EthTransaction<Self::Api>>;
diff --git a/bridge-proxy/wasm/src/lib.rs b/bridge-proxy/wasm/src/lib.rs
index fef3cc2e..8a2eeddc 100644
--- a/bridge-proxy/wasm/src/lib.rs
+++ b/bridge-proxy/wasm/src/lib.rs
@@ -26,9 +26,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         getPendingTransactionById => get_pending_transaction_by_id
         getPendingTransactions => get_pending_transactions
         setupMultiTransfer => set_multi_transfer_contract_address
-        setupEsdtSafe => set_esdt_safe_contract_address
+        setBridgedTokensWrapper => set_bridged_tokens_wrapper
         getMultiTransferAddress => multi_transfer_address
-        getEsdtSafeAddress => esdt_safe_address
+        getBridgedTokensWrapperAddress => bridged_tokens_wrapper_address
         pause => pause_endpoint
         unpause => unpause_endpoint
         isPaused => paused_status