From fc86e045ff16c5727d9319745a24099f067a819a Mon Sep 17 00:00:00 2001 From: --global <--global> Date: Wed, 17 Jan 2024 16:14:10 +0100 Subject: [PATCH] Remove leftover changes --- contracts/factory/src/tests/setup.rs | 2 +- contracts/multihop/src/storage.rs | 9 --------- contracts/multihop/src/tests/setup.rs | 2 +- contracts/pool/src/contract.rs | 1 - contracts/pool/src/tests/config.rs | 2 +- contracts/pool/src/tests/liquidity.rs | 7 +++++-- contracts/pool/src/tests/setup.rs | 4 ++-- contracts/pool/src/tests/stake_deployment.rs | 2 +- contracts/pool/src/tests/swap.rs | 9 ++++++--- contracts/pool_stable/src/tests/config.rs | 6 +++--- contracts/pool_stable/src/tests/liquidity.rs | 17 ++++++++--------- contracts/pool_stable/src/tests/setup.rs | 2 +- contracts/pool_stable/src/tests/swap.rs | 4 ++-- contracts/stake/src/tests/setup.rs | 2 +- 14 files changed, 32 insertions(+), 37 deletions(-) diff --git a/contracts/factory/src/tests/setup.rs b/contracts/factory/src/tests/setup.rs index 3d6dec04..5e220a3b 100644 --- a/contracts/factory/src/tests/setup.rs +++ b/contracts/factory/src/tests/setup.rs @@ -38,7 +38,7 @@ pub fn deploy_factory_contract<'a>( env: &Env, admin: impl Into>, ) -> FactoryClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let factory = FactoryClient::new(env, &env.register_contract(None, Factory {})); let multihop_wasm_hash = install_multihop_wasm(env); diff --git a/contracts/multihop/src/storage.rs b/contracts/multihop/src/storage.rs index 3dde62ec..a88f8aa0 100644 --- a/contracts/multihop/src/storage.rs +++ b/contracts/multihop/src/storage.rs @@ -1,14 +1,5 @@ use soroban_sdk::{contracttype, Address, Env, Vec}; -#[contracttype] -#[derive(Clone, Debug, PartialEq, Eq)] -pub struct Referral { - /// Address of the referral - pub address: Address, - /// fee in bps, later parsed to percentage - pub fee: i64, -} - #[contracttype] #[derive(Clone, Debug, Eq, PartialEq)] pub struct Swap { diff --git a/contracts/multihop/src/tests/setup.rs b/contracts/multihop/src/tests/setup.rs index b19aad64..90bbdd77 100644 --- a/contracts/multihop/src/tests/setup.rs +++ b/contracts/multihop/src/tests/setup.rs @@ -67,7 +67,7 @@ pub fn deploy_multihop_contract<'a>( admin: impl Into>, factory: &Address, ) -> MultihopClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let multihop = MultihopClient::new(env, &env.register_contract(None, Multihop {})); diff --git a/contracts/pool/src/contract.rs b/contracts/pool/src/contract.rs index e36a54bb..52e074b4 100644 --- a/contracts/pool/src/contract.rs +++ b/contracts/pool/src/contract.rs @@ -17,7 +17,6 @@ use crate::{ }; use decimal::Decimal; use phoenix::{ - referral::Referral, utils::{assert_approx_ratio, StakeInitInfo, TokenInitInfo}, validate_int_parameters, }; diff --git a/contracts/pool/src/tests/config.rs b/contracts/pool/src/tests/config.rs index b76c1805..9fece966 100644 --- a/contracts/pool/src/tests/config.rs +++ b/contracts/pool/src/tests/config.rs @@ -1,5 +1,5 @@ extern crate std; -use soroban_sdk::{Address, Env, String}; +use soroban_sdk::{testutils::Address as _, Address, Env, String}; use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract}; use crate::storage::{Config, PairType}; diff --git a/contracts/pool/src/tests/liquidity.rs b/contracts/pool/src/tests/liquidity.rs index 7ed5249d..d4ff9992 100644 --- a/contracts/pool/src/tests/liquidity.rs +++ b/contracts/pool/src/tests/liquidity.rs @@ -2,8 +2,11 @@ extern crate std; use pretty_assertions::assert_eq; -use soroban_sdk::testutils::{AuthorizedFunction, AuthorizedInvocation}; -use soroban_sdk::{symbol_short, Address, Env, IntoVal, String, Symbol}; +use soroban_sdk::{ + symbol_short, + testutils::{Address as _, AuthorizedFunction, AuthorizedInvocation}, + Address, Env, IntoVal, String, Symbol, +}; use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract}; use crate::{ diff --git a/contracts/pool/src/tests/setup.rs b/contracts/pool/src/tests/setup.rs index f02de7d5..6acfe7fe 100644 --- a/contracts/pool/src/tests/setup.rs +++ b/contracts/pool/src/tests/setup.rs @@ -1,4 +1,4 @@ -use soroban_sdk::{Address, BytesN, Env, String}; +use soroban_sdk::{testutils::Address as _, Address, BytesN, Env, String}; use crate::{ contract::{LiquidityPool, LiquidityPoolClient}, @@ -35,7 +35,7 @@ pub fn deploy_liquidity_pool_contract<'a>( max_allowed_slippage_bps: impl Into>, max_allowed_spread_bps: impl Into>, ) -> LiquidityPoolClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let pool = LiquidityPoolClient::new(env, &env.register_contract(None, LiquidityPool {})); let token_wasm_hash = install_token_wasm(env); let stake_wasm_hash = install_stake_wasm(env); diff --git a/contracts/pool/src/tests/stake_deployment.rs b/contracts/pool/src/tests/stake_deployment.rs index 0e24cb40..f910f758 100644 --- a/contracts/pool/src/tests/stake_deployment.rs +++ b/contracts/pool/src/tests/stake_deployment.rs @@ -1,6 +1,6 @@ extern crate std; use phoenix::utils::{StakeInitInfo, TokenInitInfo}; -use soroban_sdk::{Address, Env, String}; +use soroban_sdk::{testutils::Address as _, Address, Env, String}; use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract}; use crate::{ diff --git a/contracts/pool/src/tests/swap.rs b/contracts/pool/src/tests/swap.rs index 9e7035b0..c1dc84b3 100644 --- a/contracts/pool/src/tests/swap.rs +++ b/contracts/pool/src/tests/swap.rs @@ -1,13 +1,15 @@ extern crate std; use pretty_assertions::assert_eq; -use soroban_sdk::testutils::{AuthorizedFunction, AuthorizedInvocation}; -use soroban_sdk::{symbol_short, Address, Env, IntoVal, String}; +use soroban_sdk::{ + symbol_short, + testutils::{Address as _, AuthorizedFunction, AuthorizedInvocation}, + Address, Env, IntoVal, String, +}; use test_case::test_case; use super::setup::{deploy_liquidity_pool_contract, deploy_token_contract}; use crate::storage::{Asset, PoolResponse, SimulateReverseSwapResponse, SimulateSwapResponse}; use decimal::Decimal; -use phoenix::referral::Referral; #[test] fn simple_swap() { @@ -335,6 +337,7 @@ fn swap_should_panic_with_bad_max_spread() { env.budget().reset_unlimited(); let mut admin1 = Address::generate(&env); + let mut admin2 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); diff --git a/contracts/pool_stable/src/tests/config.rs b/contracts/pool_stable/src/tests/config.rs index 79c0e58f..34fab8bc 100644 --- a/contracts/pool_stable/src/tests/config.rs +++ b/contracts/pool_stable/src/tests/config.rs @@ -98,7 +98,7 @@ fn update_config_unauthorized() { env.mock_all_auths(); let mut admin1 = Address::generate(&env); - let mut admin1 = Address::generate(&env); + let mut admin2 = Address::generate(&env); let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); @@ -135,7 +135,7 @@ fn update_config_update_admin() { env.budget().reset_unlimited(); let mut admin1 = Address::generate(&env); - let mut admin1 = Address::generate(&env); + let mut admin2 = Address::generate(&env); let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); @@ -186,7 +186,7 @@ fn update_config_too_high_fees() { env.mock_all_auths(); let mut admin1 = Address::generate(&env); - let mut admin1 = Address::generate(&env); + let mut admin2 = Address::generate(&env); let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); diff --git a/contracts/pool_stable/src/tests/liquidity.rs b/contracts/pool_stable/src/tests/liquidity.rs index 067ff53e..53ecf19e 100644 --- a/contracts/pool_stable/src/tests/liquidity.rs +++ b/contracts/pool_stable/src/tests/liquidity.rs @@ -135,7 +135,7 @@ fn withdraw_liquidity() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -239,7 +239,7 @@ fn provide_liqudity_single_asset_on_empty_pool() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -279,7 +279,7 @@ fn provide_liqudity_single_asset_equal() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -347,7 +347,7 @@ fn provide_liqudity_single_asset_equal_with_fees() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -424,7 +424,7 @@ fn provide_liqudity_single_asset_one_third() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -488,7 +488,7 @@ fn provide_liqudity_single_asset_one_third_with_fees() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -549,7 +549,6 @@ fn provide_liqudity_too_high_fees() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -579,7 +578,7 @@ fn swap_with_no_amounts() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -614,7 +613,7 @@ fn withdraw_liqudity_below_min() { let mut admin1 = Address::generate(&env); let mut admin2 = Address::generate(&env); - let user = Address::generate(&env); + let user1 = Address::generate(&env); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); diff --git a/contracts/pool_stable/src/tests/setup.rs b/contracts/pool_stable/src/tests/setup.rs index 66292f35..58f5301b 100644 --- a/contracts/pool_stable/src/tests/setup.rs +++ b/contracts/pool_stable/src/tests/setup.rs @@ -35,7 +35,7 @@ pub fn deploy_stable_liquidity_pool_contract<'a>( max_allowed_slippage_bps: impl Into>, max_allowed_spread_bps: impl Into>, ) -> StableLiquidityPoolClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let pool = StableLiquidityPoolClient::new(env, &env.register_contract(None, StableLiquidityPool {})); let token_wasm_hash = install_token_wasm(env); diff --git a/contracts/pool_stable/src/tests/swap.rs b/contracts/pool_stable/src/tests/swap.rs index 0b7f7c63..7036e7db 100644 --- a/contracts/pool_stable/src/tests/swap.rs +++ b/contracts/pool_stable/src/tests/swap.rs @@ -304,8 +304,8 @@ fn swap_simulation_one_third_pool() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut token1 = deploy_token_contract(&env, Address::generate(&env)); - let mut token2 = deploy_token_contract(&env, Address::generate(&env)); + let mut token1 = deploy_token_contract(&env, &Address::generate(&env)); + let mut token2 = deploy_token_contract(&env, &Address::generate(&env)); if token2.address < token1.address { std::mem::swap(&mut token1, &mut token2); } diff --git a/contracts/stake/src/tests/setup.rs b/contracts/stake/src/tests/setup.rs index 9e7e1b34..8450358a 100644 --- a/contracts/stake/src/tests/setup.rs +++ b/contracts/stake/src/tests/setup.rs @@ -19,7 +19,7 @@ pub fn deploy_staking_contract<'a>( admin: impl Into>, lp_token: &Address, ) -> StakingClient<'a> { - let admin = admin.into().unwrap_or(Address::generate(&env)); + let admin = admin.into().unwrap_or(Address::generate(env)); let staking = StakingClient::new(env, &env.register_contract(None, Staking {})); staking.initialize(&admin, lp_token, &MIN_BOND, &MAX_DISTRIBUTIONS, &MIN_REWARD);