vault cleanup (retrieve_funds_promises)

Author: andrei-marinica

contracts/feature-tests/composability/forwarder-barnard/src/vault_proxy.rs

@@ -238,22 +238,4 @@ where
             .argument(&endpoint)
             .original_result()
     }
-
-    pub fn num_called_retrieve_funds_promises(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_called_retrieve_funds_promises")
-            .original_result()
-    }
-
-    pub fn num_async_calls_sent_from_child(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_async_calls_sent_from_child")
-            .original_result()
-    }
 }

contracts/feature-tests/composability/forwarder/src/vault_proxy.rs

@@ -238,22 +238,4 @@ where
             .argument(&endpoint)
             .original_result()
     }
-
-    pub fn num_called_retrieve_funds_promises(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_called_retrieve_funds_promises")
-            .original_result()
-    }
-
-    pub fn num_async_calls_sent_from_child(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_async_calls_sent_from_child")
-            .original_result()
-    }
 }

contracts/feature-tests/composability/interact/src/vault_proxy.rs

@@ -238,22 +238,4 @@ where
             .argument(&endpoint)
             .original_result()
     }
-
-    pub fn num_called_retrieve_funds_promises(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_called_retrieve_funds_promises")
-            .original_result()
-    }
-
-    pub fn num_async_calls_sent_from_child(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_async_calls_sent_from_child")
-            .original_result()
-    }
 }

contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs

@@ -238,22 +238,4 @@ where
             .argument(&endpoint)
             .original_result()
     }
-
-    pub fn num_called_retrieve_funds_promises(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_called_retrieve_funds_promises")
-            .original_result()
-    }
-
-    pub fn num_async_calls_sent_from_child(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("num_async_calls_sent_from_child")
-            .original_result()
-    }
 }

contracts/feature-tests/composability/vault/sc-config.toml

@@ -3,11 +3,6 @@ name = "vault"
 add-unlabelled = true
 add-labels = ["upgrade"]
 
-[contracts.promises]
-name = "vault-promises"
-add-unlabelled = true
-add-labels = ["promises-endpoint"]
-
 [contracts.upgrade]
 name = "vault-upgrade"
 add-unlabelled = false

contracts/feature-tests/composability/vault/src/vault.rs

@@ -109,46 +109,6 @@ pub trait Vault {
             .transfer_execute();
     }
 
-    #[allow_multiple_var_args]
-    #[label("promises-endpoint")]
-    #[payable("*")]
-    #[endpoint]
-    fn retrieve_funds_promises(
-        &self,
-        back_transfers: OptionalValue<u64>,
-        back_transfer_value: OptionalValue<BigUint>,
-    ) {
-        let payment = self.call_value().egld_or_single_esdt();
-        let caller = self.blockchain().get_caller();
-        let endpoint_name = ManagedBuffer::from(b"");
-        let nr_callbacks = match back_transfers.into_option() {
-            Some(nr) => nr,
-            None => sc_panic!("Nr of calls is None"),
-        };
-
-        let value = match back_transfer_value.into_option() {
-            Some(val) => val,
-            None => sc_panic!("Value for parent callback is None"),
-        };
-
-        let return_payment =
-            EgldOrEsdtTokenPayment::new(payment.token_identifier, payment.token_nonce, value);
-
-        self.num_called_retrieve_funds_promises()
-            .update(|c| *c += 1);
-
-        for _ in 0..nr_callbacks {
-            self.num_async_calls_sent_from_child().update(|c| *c += 1);
-
-            self.tx()
-                .to(&caller)
-                .raw_call(endpoint_name.clone())
-                .payment(&return_payment)
-                .gas(self.blockchain().get_gas_left() / 2)
-                .transfer_execute()
-        }
-    }
-
     #[endpoint]
     fn retrieve_funds(&self, token: EgldOrEsdtTokenIdentifier, nonce: u64, amount: BigUint) {
         self.retrieve_funds_event(&token, nonce, &amount);
@@ -275,12 +235,4 @@ pub trait Vault {
     #[view]
     #[storage_mapper("call_counts")]
     fn call_counts(&self, endpoint: ManagedBuffer) -> SingleValueMapper<usize>;
-
-    #[view]
-    #[storage_mapper("num_called_retrieve_funds_promises")]
-    fn num_called_retrieve_funds_promises(&self) -> SingleValueMapper<usize>;
-
-    #[view]
-    #[storage_mapper("num_async_calls_sent_from_child")]
-    fn num_async_calls_sent_from_child(&self) -> SingleValueMapper<usize>;
 }