From d9c5ea0a18ba0015c7f2c2a29bcf10e2e33a978c Mon Sep 17 00:00:00 2001
From: Andrei Baltariu <andreibaltariu1304@gmail.com>
Date: Wed, 13 Nov 2024 17:26:47 +0200
Subject: [PATCH] Fixed tests

Signed-off-by: Andrei Baltariu <andreibaltariu1304@gmail.com>
---
 chain-factory/tests/chain_factory_tests.rs |  6 +-----
 common/proxies/src/chain_factory_proxy.rs  | 15 ++++++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/chain-factory/tests/chain_factory_tests.rs b/chain-factory/tests/chain_factory_tests.rs
index 22ff8b2b..a6d7bc1a 100644
--- a/chain-factory/tests/chain_factory_tests.rs
+++ b/chain-factory/tests/chain_factory_tests.rs
@@ -19,7 +19,6 @@ const CONFIG_CODE_PATH: MxscPath = MxscPath::new("../chain-config/output/chain-f
 
 const OWNER: TestAddress = TestAddress::new("owner");
 const OWNER_BALANCE: u64 = 100_000_000_000;
-const DEPLOY_COST: u64 = 10_000_000_000;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
@@ -80,7 +79,6 @@ impl ChainFactoryTestState {
 
     fn propose_deploy_chain_config_from_factory(
         &mut self,
-        payment: BigUint<StaticApi>,
         min_validators: usize,
         max_validators: usize,
         min_stake: BigUint<StaticApi>,
@@ -98,8 +96,7 @@ impl ChainFactoryTestState {
                 max_validators,
                 min_stake,
                 additional_stake_required,
-            )
-            .egld(payment);
+            );
 
         match expected_result {
             Some(error) => {
@@ -139,7 +136,6 @@ fn deploy_chain_config_from_factory() {
     println!("{}", current_dir().unwrap().to_str().unwrap());
 
     state.propose_deploy_chain_config_from_factory(
-        DEPLOY_COST.into(),
         min_validators,
         max_validators,
         min_stake,
diff --git a/common/proxies/src/chain_factory_proxy.rs b/common/proxies/src/chain_factory_proxy.rs
index 28c76179..58e7e8c9 100644
--- a/common/proxies/src/chain_factory_proxy.rs
+++ b/common/proxies/src/chain_factory_proxy.rs
@@ -105,8 +105,9 @@ where
         max_validators: Arg1,
         min_stake: Arg2,
         additional_stake_required: Arg3,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ManagedAddress<Env::Api>> {
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
+            .payment(NotPayable)
             .raw_call("deploySovereignChainConfigContract")
             .argument(&min_validators)
             .argument(&max_validators)
@@ -131,22 +132,22 @@ where
     pub fn deploy_enshrine_esdt_safe<
         Arg0: ProxyArg<bool>,
         Arg1: ProxyArg<ManagedAddress<Env::Api>>,
-        Arg2: ProxyArg<Option<TokenIdentifier<Env::Api>>>,
-        Arg3: ProxyArg<Option<ManagedBuffer<Env::Api>>>,
+        Arg2: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg3: ProxyArg<ManagedBuffer<Env::Api>>,
     >(
         self,
         is_sovereign_chain: Arg0,
         token_handler_address: Arg1,
-        opt_wegld_identifier: Arg2,
-        opt_sov_token_prefix: Arg3,
+        wegld_identifier: Arg2,
+        sov_token_prefix: Arg3,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call("deployEnshrineEsdtSafe")
             .argument(&is_sovereign_chain)
             .argument(&token_handler_address)
-            .argument(&opt_wegld_identifier)
-            .argument(&opt_sov_token_prefix)
+            .argument(&wegld_identifier)
+            .argument(&sov_token_prefix)
             .original_result()
     }