small tests fixes

Author: psorinionut

dex/pair/src/lib.rs

@@ -68,10 +68,6 @@ pub trait Pair<ContractReader>:
         );
         require!(first_token_id != second_token_id, ERROR_SAME_TOKENS);
 
-        let lp_token_id = self.lp_token_identifier().get();
-        require!(first_token_id != lp_token_id, ERROR_POOL_TOKEN_IS_PLT);
-        require!(second_token_id != lp_token_id, ERROR_POOL_TOKEN_IS_PLT);
-
         self.set_fee_percents(total_fee_percent, special_fee_percent);
         self.state().set(State::Inactive);
 

energy-integration/governance-v2/src/proposal.rs

@@ -97,7 +97,7 @@ impl<M: ManagedTypeApi> GovernanceProposal<M> {
             actions: ArrayVec::default(),
             description: ManagedBuffer::default(),
             fee_payment: EsdtTokenPayment {
-                token_identifier: TokenIdentifier::from(""),
+                token_identifier: TokenIdentifier::from("EMPTY-000000"),
                 token_nonce: 0,
                 amount: BigUint::zero(),
             },

farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_interactions/mod.rs

@@ -148,6 +148,7 @@ where
         );
         let proxy_wrapper = setup_proxy(
             &owner_addr,
+            energy_factory_wrapper.address_ref(),
             lp_farm_wrapper.address_ref(),
             staking_farm_wrapper.address_ref(),
             pair_wrapper.address_ref(),

farm-staking/farm-staking-proxy/tests/staking_farm_with_lp_staking_contract_setup/mod.rs

@@ -121,6 +121,7 @@ pub fn add_proxy_to_whitelist<StakingContractObjBuilder>(
 
 pub fn setup_proxy<ProxyContractObjBuilder>(
     owner_addr: &Address,
+    energy_factory_address: &Address,
     lp_farm_address: &Address,
     staking_farm_address: &Address,
     pair_address: &Address,
@@ -137,7 +138,7 @@ where
     b_mock
         .execute_tx(owner_addr, &proxy_wrapper, &rust_zero, |sc| {
             sc.init(
-                managed_address!(staking_farm_address), // TODO - replace with energy factory address when needed
+                managed_address!(energy_factory_address),
                 managed_address!(lp_farm_address),
                 managed_address!(staking_farm_address),
                 managed_address!(pair_address),

farm-staking/farm-staking/tests/farm_staking_setup/mod.rs

@@ -17,6 +17,7 @@ pub type RustBigUint = num_bigint::BigUint;
 
 use config::*;
 use energy_factory::energy::EnergyModule;
+use energy_factory::token_whitelist::TokenWhitelistModule;
 use energy_query::{Energy, EnergyQueryModule};
 use farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule;
 use farm_staking::claim_stake_farm_rewards::ClaimStakeFarmRewardsModule;
@@ -100,6 +101,13 @@ where
             "energy_factory.wasm",
         );
 
+        b_mock
+            .execute_tx(&owner_addr, &energy_factory_wrapper, &rust_zero, |sc| {
+                sc.base_asset_token_id()
+                    .set(managed_token_id!(b"MEX-abcdef"));
+            })
+            .assert_ok();
+
         let permissions_hub_wrapper = b_mock.create_sc_account(
             &rust_zero,
             Some(&owner_addr),