From 240c321769d51de78054f31451d1a881913679b4 Mon Sep 17 00:00:00 2001 From: Jakub Date: Tue, 9 Jan 2024 15:11:46 +0100 Subject: [PATCH] Fix clippy lints and formatting --- contracts/factory/src/contract.rs | 32 +++- contracts/factory/src/tests.rs | 5 +- contracts/factory/src/tests/config.rs | 42 +++-- contracts/factory/src/tests/queries.rs | 102 +++++++++--- contracts/factory/src/tests/setup.rs | 7 +- contracts/factory/src/utils.rs | 2 +- contracts/multihop/src/contract.rs | 6 +- contracts/multihop/src/tests.rs | 5 +- contracts/multihop/src/tests/query.rs | 55 +++++-- contracts/multihop/src/tests/setup.rs | 9 +- contracts/multihop/src/tests/swap.rs | 90 ++++++++--- contracts/multihop/src/utils.rs | 82 ++++++++-- contracts/pool/src/tests/swap.rs | 4 +- contracts/pool_stable/src/tests/config.rs | 67 ++++++-- contracts/pool_stable/src/tests/liquidity.rs | 147 ++++++++++++++---- contracts/pool_stable/src/tests/setup.rs | 16 +- .../pool_stable/src/tests/stake_deployment.rs | 32 +++- contracts/pool_stable/src/tests/swap.rs | 89 +++++++++-- contracts/stake/src/tests/bond.rs | 17 +- contracts/stake/src/tests/distribution.rs | 115 ++++++++++---- contracts/stake/src/tests/setup.rs | 9 +- 21 files changed, 739 insertions(+), 194 deletions(-) diff --git a/contracts/factory/src/contract.rs b/contracts/factory/src/contract.rs index ad9167797..159009518 100644 --- a/contracts/factory/src/contract.rs +++ b/contracts/factory/src/contract.rs @@ -197,7 +197,7 @@ fn validate_token_info( #[cfg(test)] mod tests { use super::*; - use soroban_sdk::{String, BytesN, Bytes, testutils::Address as _}; + use soroban_sdk::{testutils::Address as _, Bytes, BytesN, String}; #[test] #[should_panic( @@ -209,8 +209,14 @@ mod tests { let token_wasm_hash = BytesN::from_array(&env, &[8u8; 0x20]); let stake_wasm_hash = BytesN::from_array(&env, &[15u8; 0x20]); - let token_a = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); - let token_b = Address::from_string(&String::from_str(&env, "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN")); + let token_a = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); + let token_b = Address::from_string(&String::from_str( + &env, + "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN", + )); let token_init_info = TokenInitInfo { token_a, @@ -237,8 +243,14 @@ mod tests { let token_wasm_hash = BytesN::from_array(&env, &[8u8; 0x20]); let stake_wasm_hash = BytesN::from_array(&env, &[15u8; 0x20]); - let token_a = Address::from_string(&String::from_str(&env, "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN")); - let token_b = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); + let token_a = Address::from_string(&String::from_str( + &env, + "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN", + )); + let token_b = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); let token_init_info = TokenInitInfo { token_a, @@ -264,8 +276,14 @@ mod tests { let token_wasm_hash = BytesN::from_array(&env, &[8u8; 0x20]); let stake_wasm_hash = BytesN::from_array(&env, &[15u8; 0x20]); - let token_a = Address::from_string(&String::from_str(&env, "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN")); - let token_b = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); + let token_a = Address::from_string(&String::from_str( + &env, + "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN", + )); + let token_b = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); let token_init_info = TokenInitInfo { token_a, diff --git a/contracts/factory/src/tests.rs b/contracts/factory/src/tests.rs index 2b7c886a6..6b3cb3077 100644 --- a/contracts/factory/src/tests.rs +++ b/contracts/factory/src/tests.rs @@ -14,7 +14,10 @@ fn test_deploy_factory_twice_should_fail() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let multihop = FactoryClient::new(&env, &env.register_contract(None, Factory {})); let multihop_wasm_hash = install_multihop_wasm(&env); diff --git a/contracts/factory/src/tests/config.rs b/contracts/factory/src/tests/config.rs index 8faa37cdb..aa192f8f1 100644 --- a/contracts/factory/src/tests/config.rs +++ b/contracts/factory/src/tests/config.rs @@ -10,7 +10,10 @@ use soroban_sdk::{Symbol, Vec}; #[test] fn factory_successfully_inits_itself() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let factory = deploy_factory_contract(&env, Some(admin.clone())); @@ -22,7 +25,10 @@ fn factory_successfully_inits_multihop() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let factory = deploy_factory_contract(&env, Some(admin.clone())); @@ -37,13 +43,31 @@ fn factory_successfully_inits_multihop() { #[test] fn factory_successfully_inits_lp() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let mut token1_admin = Address::from_string(&String::from_str(&env, "CDJ4KQHEFNC5GBCRBKGIDGNLVVXORIDHXU5EYFQIXMDPJ3ACJVPXUOFY")); - let mut token2_admin = Address::from_string(&String::from_str(&env, "CC6TPVKWO2ZHGIMAIBPKE3RA74TGPCD6637FAT5NS3UCFDQ7OHMIIG6I")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - - let mut token1 = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); - let mut token2 = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let mut token1_admin = Address::from_string(&String::from_str( + &env, + "CDJ4KQHEFNC5GBCRBKGIDGNLVVXORIDHXU5EYFQIXMDPJ3ACJVPXUOFY", + )); + let mut token2_admin = Address::from_string(&String::from_str( + &env, + "CC6TPVKWO2ZHGIMAIBPKE3RA74TGPCD6637FAT5NS3UCFDQ7OHMIIG6I", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + + let mut token1 = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); + let mut token2 = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); env.mock_all_auths(); env.budget().reset_unlimited(); diff --git a/contracts/factory/src/tests/queries.rs b/contracts/factory/src/tests/queries.rs index 388f4f293..5e23eeab4 100644 --- a/contracts/factory/src/tests/queries.rs +++ b/contracts/factory/src/tests/queries.rs @@ -3,7 +3,7 @@ use super::setup::{ }; use phoenix::utils::{LiquidityPoolInitInfo, StakeInitInfo, TokenInitInfo}; -use soroban_sdk::{contracttype, testutils::arbitrary::std, Address, Env, Symbol, Vec, String}; +use soroban_sdk::{contracttype, testutils::arbitrary::std, Address, Env, String, Symbol, Vec}; #[contracttype] #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -33,15 +33,39 @@ pub struct LiquidityPoolConfig { #[test] fn test_deploy_multiple_liquidity_pools() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - - let mut token1 = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); - let mut token2 = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); - let mut token3 = Address::from_string(&String::from_str(&env, "CDWLHFNUQ2CM5WJKIFGEMY5LMXPARVKHD5FJONZTCPXKEYPCUT5PW2L2")); - let mut token4 = Address::from_string(&String::from_str(&env, "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC")); - let mut token5 = Address::from_string(&String::from_str(&env, "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267")); - let mut token6 = Address::from_string(&String::from_str(&env, "CCIEUAD63OGWJ3FKBI5SZG7HZ34PPYF4RCPWVB5SOP6G7FBBNAVPYHKW")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + + let mut token1 = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); + let mut token2 = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); + let mut token3 = Address::from_string(&String::from_str( + &env, + "CDWLHFNUQ2CM5WJKIFGEMY5LMXPARVKHD5FJONZTCPXKEYPCUT5PW2L2", + )); + let mut token4 = Address::from_string(&String::from_str( + &env, + "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC", + )); + let mut token5 = Address::from_string(&String::from_str( + &env, + "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267", + )); + let mut token6 = Address::from_string(&String::from_str( + &env, + "CCIEUAD63OGWJ3FKBI5SZG7HZ34PPYF4RCPWVB5SOP6G7FBBNAVPYHKW", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -229,15 +253,39 @@ fn test_deploy_multiple_liquidity_pools() { #[test] fn test_queries_by_tuple() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - - let mut token1 = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); - let mut token2 = Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX")); - let mut token3 = Address::from_string(&String::from_str(&env, "CDWLHFNUQ2CM5WJKIFGEMY5LMXPARVKHD5FJONZTCPXKEYPCUT5PW2L2")); - let mut token4 = Address::from_string(&String::from_str(&env, "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC")); - let mut token5 = Address::from_string(&String::from_str(&env, "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267")); - let mut token6 = Address::from_string(&String::from_str(&env, "CCIEUAD63OGWJ3FKBI5SZG7HZ34PPYF4RCPWVB5SOP6G7FBBNAVPYHKW")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + + let mut token1 = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); + let mut token2 = Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )); + let mut token3 = Address::from_string(&String::from_str( + &env, + "CDWLHFNUQ2CM5WJKIFGEMY5LMXPARVKHD5FJONZTCPXKEYPCUT5PW2L2", + )); + let mut token4 = Address::from_string(&String::from_str( + &env, + "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC", + )); + let mut token5 = Address::from_string(&String::from_str( + &env, + "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267", + )); + let mut token6 = Address::from_string(&String::from_str( + &env, + "CCIEUAD63OGWJ3FKBI5SZG7HZ34PPYF4RCPWVB5SOP6G7FBBNAVPYHKW", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -381,8 +429,20 @@ fn test_queries_by_tuple() { #[should_panic(expected = "Factory: query_for_pool_by_token_pair failed: No liquidity pool found")] fn test_queries_by_tuple_errors() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let factory = deploy_factory_contract(&env, Some(admin.clone())); - factory.query_for_pool_by_token_pair(&Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")), &Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O"))); + factory.query_for_pool_by_token_pair( + &Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )), + &Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )), + ); } diff --git a/contracts/factory/src/tests/setup.rs b/contracts/factory/src/tests/setup.rs index b56f0c7f3..85a044901 100644 --- a/contracts/factory/src/tests/setup.rs +++ b/contracts/factory/src/tests/setup.rs @@ -38,7 +38,12 @@ pub fn deploy_factory_contract<'a>( env: &Env, admin: impl Into>, ) -> FactoryClient<'a> { - let admin = admin.into().unwrap_or(Address::from_string(&String::from_str(&env, "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE"))); + let admin = admin + .into() + .unwrap_or(Address::from_string(&String::from_str( + &env, + "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE", + ))); let factory = FactoryClient::new(env, &env.register_contract(None, Factory {})); let multihop_wasm_hash = install_multihop_wasm(env); diff --git a/contracts/factory/src/utils.rs b/contracts/factory/src/utils.rs index 8ad5a6185..8efb363af 100644 --- a/contracts/factory/src/utils.rs +++ b/contracts/factory/src/utils.rs @@ -1,4 +1,4 @@ -use soroban_sdk::{xdr::ToXdr, Address, Bytes, BytesN, Env, IntoVal, Symbol, Val, Vec, String}; +use soroban_sdk::{xdr::ToXdr, Address, Bytes, BytesN, Env, IntoVal, Symbol, Val, Vec}; pub fn deploy_lp_contract( env: &Env, diff --git a/contracts/multihop/src/contract.rs b/contracts/multihop/src/contract.rs index e739d3b75..a918ef0a4 100644 --- a/contracts/multihop/src/contract.rs +++ b/contracts/multihop/src/contract.rs @@ -1,10 +1,12 @@ use soroban_sdk::{contract, contractimpl, contractmeta, vec, Address, Env, Vec}; +use crate::lp_contract::Referral; use crate::storage::{ get_factory, is_initialized, save_factory, set_initialized, DataKey, - SimulateReverseSwapResponse, SimulateSwapResponse, Swap}; + SimulateReverseSwapResponse, SimulateSwapResponse, Swap, +}; use crate::utils::{verify_reverse_swap, verify_swap}; -use crate::{factory_contract, lp_contract, lp_contract::Referral}; +use crate::{factory_contract, lp_contract}; // Metadata that is added on to the WASM custom section contractmeta!( diff --git a/contracts/multihop/src/tests.rs b/contracts/multihop/src/tests.rs index a6f689aa7..5c32b4301 100644 --- a/contracts/multihop/src/tests.rs +++ b/contracts/multihop/src/tests.rs @@ -13,7 +13,10 @@ fn test_deploy_multihop_twice_should_fail() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let multihop = MultihopClient::new(&env, &env.register_contract(None, Multihop {})); let factory = deploy_factory_contract(&env, admin.clone()); diff --git a/contracts/multihop/src/tests/query.rs b/contracts/multihop/src/tests/query.rs index 95a3720cd..bfd6da8a6 100644 --- a/contracts/multihop/src/tests/query.rs +++ b/contracts/multihop/src/tests/query.rs @@ -12,7 +12,10 @@ fn simulate_swap_single_pool_no_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let token1 = deploy_and_mint_tokens(&env, &admin, 100_000_000i128); let token2 = deploy_and_mint_tokens(&env, &admin, 200_000_000i128); @@ -62,7 +65,10 @@ fn simulate_swap_three_equal_pools_no_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let token1 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); let token2 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); @@ -165,7 +171,10 @@ fn simulate_swap_single_pool_with_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let token1 = deploy_and_mint_tokens(&env, &admin, 1_001_000i128); let token2 = deploy_and_mint_tokens(&env, &admin, 1_001_000i128); @@ -217,7 +226,10 @@ fn simulate_swap_three_different_pools_no_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let token1 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); let token2 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); @@ -320,7 +332,10 @@ fn simulate_swap_three_different_pools_with_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let token1 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); let token2 = deploy_and_mint_tokens(&env, &admin, 10_000_000i128); @@ -447,10 +462,19 @@ fn simulate_swap_three_different_pools_with_fees() { fn query_simulate_swap_panics_with_no_operations() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let factory = Address::from_string(&String::from_str(&env, "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let factory = Address::from_string(&String::from_str( + &env, + "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC", + )); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); let token = deploy_token_contract(&env, &admin); token.mint(&recipient, &50i128); @@ -467,10 +491,19 @@ fn query_simulate_swap_panics_with_no_operations() { fn query_simulate_reverse_swap_panics_with_no_operations() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let factory = Address::from_string(&String::from_str(&env, "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let factory = Address::from_string(&String::from_str( + &env, + "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC", + )); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); let token = deploy_token_contract(&env, &admin); token.mint(&recipient, &50i128); diff --git a/contracts/multihop/src/tests/setup.rs b/contracts/multihop/src/tests/setup.rs index 3ef6534cc..bd6fcfc10 100644 --- a/contracts/multihop/src/tests/setup.rs +++ b/contracts/multihop/src/tests/setup.rs @@ -1,7 +1,7 @@ use crate::contract::{Multihop, MultihopClient}; use crate::tests::setup::factory::{LiquidityPoolInitInfo, StakeInitInfo, TokenInitInfo}; -use soroban_sdk::testutils::{Address as _, arbitrary::std}; +use soroban_sdk::testutils::{arbitrary::std, Address as _}; use soroban_sdk::{Address, Bytes, BytesN, Env, String}; pub mod factory { @@ -65,7 +65,12 @@ pub fn deploy_multihop_contract<'a>( admin: impl Into>, factory: &Address, ) -> MultihopClient<'a> { - let admin = admin.into().unwrap_or(Address::from_string(&String::from_str(&env, "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE"))); + let admin = admin + .into() + .unwrap_or(Address::from_string(&String::from_str( + &env, + "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE", + ))); let multihop = MultihopClient::new(env, &env.register_contract(None, Multihop {})); diff --git a/contracts/multihop/src/tests/swap.rs b/contracts/multihop/src/tests/swap.rs index 4b8a6b8f8..dd1388240 100644 --- a/contracts/multihop/src/tests/swap.rs +++ b/contracts/multihop/src/tests/swap.rs @@ -19,7 +19,10 @@ pub enum ContractError { fn swap_three_equal_pools_no_fees() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -65,7 +68,10 @@ fn swap_three_equal_pools_no_fees() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &50i128); assert_eq!(token1.balance(&recipient), 50i128); assert_eq!(token4.balance(&recipient), 0i128); @@ -96,7 +102,10 @@ fn swap_three_equal_pools_no_fees() { fn swap_three_equal_pools_no_fees_referral_fee() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -142,7 +151,10 @@ fn swap_three_equal_pools_no_fees_referral_fee() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &50i128); assert_eq!(token1.balance(&recipient), 50i128); assert_eq!(token4.balance(&recipient), 0i128); @@ -161,7 +173,10 @@ fn swap_three_equal_pools_no_fees_referral_fee() { }; let operations = vec![&env, swap1, swap2, swap3]; - let referral_addr = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let referral_addr = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); let referral = Referral { address: referral_addr.clone(), fee: 1_000, @@ -190,7 +205,10 @@ fn swap_three_equal_pools_no_fees_referral_fee() { #[test] fn swap_single_pool_no_fees() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -214,7 +232,10 @@ fn swap_single_pool_no_fees() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &5_000i128); // mints 50 token0 to recipient assert_eq!(token1.balance(&recipient), 5_000i128); assert_eq!(token2.balance(&recipient), 0i128); @@ -238,7 +259,10 @@ fn swap_single_pool_no_fees() { #[should_panic(expected = "HostError: Error(Contract, #1)")] fn swap_should_fail_when_spread_exceeds_the_limit() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -260,7 +284,10 @@ fn swap_should_fail_when_spread_exceeds_the_limit() { ); let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &5_000i128); // mints 50 token0 to recipient let swap1 = Swap { @@ -276,7 +303,10 @@ fn swap_should_fail_when_spread_exceeds_the_limit() { #[test] fn swap_single_pool_with_fees() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -300,7 +330,10 @@ fn swap_single_pool_with_fees() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &1000i128); assert_eq!(token1.balance(&recipient), 1000i128); assert_eq!(token2.balance(&recipient), 0i128); @@ -326,7 +359,10 @@ fn swap_single_pool_with_fees() { fn swap_three_different_pools_no_fees() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -372,7 +408,10 @@ fn swap_three_different_pools_no_fees() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &5_000i128); assert_eq!(token1.balance(&recipient), 5_000i128); @@ -408,7 +447,10 @@ fn swap_three_different_pools_no_fees() { fn swap_three_different_pools_with_fees() { let env = Env::default(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); env.mock_all_auths(); env.budget().reset_unlimited(); @@ -454,7 +496,10 @@ fn swap_three_different_pools_with_fees() { // 4. swap with multihop let multihop = deploy_multihop_contract(&env, admin.clone(), &factory_client.address); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); token1.mint(&recipient, &10_000i128); assert_eq!(token1.balance(&recipient), 10_000i128); @@ -505,10 +550,19 @@ fn swap_three_different_pools_with_fees() { fn swap_panics_with_no_operations() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let factory = Address::from_string(&String::from_str(&env, "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let factory = Address::from_string(&String::from_str( + &env, + "CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC", + )); - let recipient = Address::from_string(&String::from_str(&env, "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX")); + let recipient = Address::from_string(&String::from_str( + &env, + "CCDS5FMXB4M7HP7E6SCYAQASHLL2SG4OPZL3BNORDXVYMOCVG2WRYYZX", + )); let token = deploy_token_contract(&env, &admin); token.mint(&recipient, &50i128); diff --git a/contracts/multihop/src/utils.rs b/contracts/multihop/src/utils.rs index 226d830d9..a276f48ec 100644 --- a/contracts/multihop/src/utils.rs +++ b/contracts/multihop/src/utils.rs @@ -1,4 +1,4 @@ -use soroban_sdk::{Vec, String}; +use soroban_sdk::Vec; use crate::storage::Swap; @@ -29,10 +29,22 @@ mod tests { fn verify_operations_in_swap_should_work() { let env = Env::default(); - let token1 = Address::from_string(&String::from_str(&env, "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3")); - let token2 = Address::from_string(&String::from_str(&env, "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT")); - let token3 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); - let token4 = Address::from_string(&String::from_str(&env, "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB")); + let token1 = Address::from_string(&String::from_str( + &env, + "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3", + )); + let token2 = Address::from_string(&String::from_str( + &env, + "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT", + )); + let token3 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); + let token4 = Address::from_string(&String::from_str( + &env, + "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB", + )); let swap1 = Swap { offer_asset: token1.clone(), @@ -56,10 +68,22 @@ mod tests { fn verify_operations_in_reverse_swap_should_work() { let env = Env::default(); - let token1 = Address::from_string(&String::from_str(&env, "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3")); - let token2 = Address::from_string(&String::from_str(&env, "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT")); - let token3 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); - let token4 = Address::from_string(&String::from_str(&env, "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB")); + let token1 = Address::from_string(&String::from_str( + &env, + "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3", + )); + let token2 = Address::from_string(&String::from_str( + &env, + "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT", + )); + let token3 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); + let token4 = Address::from_string(&String::from_str( + &env, + "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB", + )); let swap1 = Swap { offer_asset: token3.clone(), @@ -84,10 +108,22 @@ mod tests { fn verify_operations_should_fail_when_bad_order_provided() { let env = Env::default(); - let token1 = Address::from_string(&String::from_str(&env, "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3")); - let token2 = Address::from_string(&String::from_str(&env, "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT")); - let token3 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); - let token4 = Address::from_string(&String::from_str(&env, "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB")); + let token1 = Address::from_string(&String::from_str( + &env, + "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3", + )); + let token2 = Address::from_string(&String::from_str( + &env, + "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT", + )); + let token3 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); + let token4 = Address::from_string(&String::from_str( + &env, + "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB", + )); let swap1 = Swap { offer_asset: token1.clone(), @@ -108,10 +144,22 @@ mod tests { fn verify_operations_reverse_swap_should_fail_when_bad_order_provided() { let env = Env::default(); - let token1 = Address::from_string(&String::from_str(&env, "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3")); - let token2 = Address::from_string(&String::from_str(&env, "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT")); - let token3 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); - let token4 = Address::from_string(&String::from_str(&env, "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB")); + let token1 = Address::from_string(&String::from_str( + &env, + "CDF2CJ26YHWB37JYTUFS722WJBJPG5OP5XN4TGZZPCEEUWHEIMGQG2O3", + )); + let token2 = Address::from_string(&String::from_str( + &env, + "CB64D3G7SM2RTH6JSGG34DDTFTQ5CFDKVDZJZSODMCX4NJ2HV2KN7OHT", + )); + let token3 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); + let token4 = Address::from_string(&String::from_str( + &env, + "CBXBKAB6QIRUGTG77OQZHC46BIIPA5WDKIKZKPA2H7Q7CPKQ555W3EVB", + )); let swap1 = Swap { offer_asset: token1.clone(), diff --git a/contracts/pool/src/tests/swap.rs b/contracts/pool/src/tests/swap.rs index 9331b1cc1..c89b2c0a9 100644 --- a/contracts/pool/src/tests/swap.rs +++ b/contracts/pool/src/tests/swap.rs @@ -5,7 +5,9 @@ use soroban_sdk::{symbol_short, 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, Referral}; +use crate::storage::{ + Asset, PoolResponse, Referral, SimulateReverseSwapResponse, SimulateSwapResponse, +}; use decimal::Decimal; #[test] diff --git a/contracts/pool_stable/src/tests/config.rs b/contracts/pool_stable/src/tests/config.rs index 0f68cafb4..d3f04c425 100644 --- a/contracts/pool_stable/src/tests/config.rs +++ b/contracts/pool_stable/src/tests/config.rs @@ -1,5 +1,5 @@ extern crate std; -use soroban_sdk::{testutils::Address as _, Address, Env, String}; +use soroban_sdk::{Address, Env, String}; use super::setup::{deploy_stable_liquidity_pool_contract, deploy_token_contract}; use crate::storage::{Config, PairType}; @@ -10,8 +10,14 @@ fn update_config() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -19,7 +25,10 @@ fn update_config() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -97,8 +106,14 @@ fn update_config_unauthorized() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -106,7 +121,10 @@ fn update_config_unauthorized() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -119,7 +137,10 @@ fn update_config_unauthorized() { ); pool.update_config( - &Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")), + &Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )), &None, &Some(500i64), // 5% fees &Some(admin2.clone()), @@ -134,8 +155,14 @@ fn update_config_update_admin() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -143,7 +170,10 @@ fn update_config_update_admin() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -185,8 +215,14 @@ fn update_config_too_high_fees() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -194,7 +230,10 @@ fn update_config_too_high_fees() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, diff --git a/contracts/pool_stable/src/tests/liquidity.rs b/contracts/pool_stable/src/tests/liquidity.rs index 8b1a130fe..d84f37dba 100644 --- a/contracts/pool_stable/src/tests/liquidity.rs +++ b/contracts/pool_stable/src/tests/liquidity.rs @@ -3,7 +3,7 @@ extern crate std; use pretty_assertions::assert_eq; use soroban_sdk::testutils::{AuthorizedFunction, AuthorizedInvocation}; -use soroban_sdk::{symbol_short, testutils::Address as _, Address, Env, IntoVal, Symbol, String}; +use soroban_sdk::{symbol_short, Address, Env, IntoVal, String, Symbol}; use super::setup::{deploy_stable_liquidity_pool_contract, deploy_token_contract}; use crate::{ @@ -18,8 +18,14 @@ fn provide_liqudity() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -27,7 +33,10 @@ fn provide_liqudity() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -130,8 +139,14 @@ fn withdraw_liquidity() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -139,7 +154,10 @@ fn withdraw_liquidity() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -234,8 +252,14 @@ fn provide_liqudity_single_asset_on_empty_pool() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -243,7 +267,10 @@ fn provide_liqudity_single_asset_on_empty_pool() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -274,8 +301,14 @@ fn provide_liqudity_single_asset_equal() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -283,7 +316,10 @@ fn provide_liqudity_single_asset_equal() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -342,8 +378,14 @@ fn provide_liqudity_single_asset_equal_with_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -351,7 +393,10 @@ fn provide_liqudity_single_asset_equal_with_fees() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 1_000i64; // 10% bps let pool = deploy_stable_liquidity_pool_contract( &env, @@ -419,8 +464,14 @@ fn provide_liqudity_single_asset_one_third() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -428,7 +479,10 @@ fn provide_liqudity_single_asset_one_third() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -483,8 +537,14 @@ fn provide_liqudity_single_asset_one_third_with_fees() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -492,7 +552,10 @@ fn provide_liqudity_single_asset_one_third_with_fees() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 1_000i64; // 10% bps let pool = deploy_stable_liquidity_pool_contract( &env, @@ -544,8 +607,14 @@ fn provide_liqudity_too_high_fees() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -573,8 +642,14 @@ fn swap_with_no_amounts() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -582,7 +657,10 @@ fn swap_with_no_amounts() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -608,8 +686,14 @@ fn withdraw_liqudity_below_min() { let env = Env::default(); env.mock_all_auths(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -617,7 +701,10 @@ fn withdraw_liqudity_below_min() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, diff --git a/contracts/pool_stable/src/tests/setup.rs b/contracts/pool_stable/src/tests/setup.rs index 32f9e7b18..547857e2e 100644 --- a/contracts/pool_stable/src/tests/setup.rs +++ b/contracts/pool_stable/src/tests/setup.rs @@ -1,4 +1,4 @@ -use soroban_sdk::{testutils::Address as _, Address, BytesN, Env, String}; +use soroban_sdk::{Address, BytesN, Env, String}; use crate::{ contract::{StableLiquidityPool, StableLiquidityPoolClient}, @@ -35,12 +35,22 @@ 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::from_string(&String::from_str(&env, "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE"))); + let admin = admin + .into() + .unwrap_or(Address::from_string(&String::from_str( + env, + "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE", + ))); let pool = StableLiquidityPoolClient::new(env, &env.register_contract(None, StableLiquidityPool {})); let token_wasm_hash = install_token_wasm(env); let stake_wasm_hash = install_stake_wasm(env); - let fee_recipient = fee_recipient.into().unwrap_or_else(|| Address::from_string(&String::from_str(&env, "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN"))); + let fee_recipient = fee_recipient.into().unwrap_or_else(|| { + Address::from_string(&String::from_str( + env, + "CAOUDQCLN3BYHH4L7GSH3OSQJFVELHKOEVKOPBENVIGZ6WZ5ZRHFC5LN", + )) + }); let max_allowed_slippage = max_allowed_slippage_bps.into().unwrap_or(5_000); // 50% if not specified let max_allowed_spread = max_allowed_spread_bps.into().unwrap_or(500); // 5% if not specified let share_token_decimals = 7u32; diff --git a/contracts/pool_stable/src/tests/stake_deployment.rs b/contracts/pool_stable/src/tests/stake_deployment.rs index 08502640a..619fe0d7d 100644 --- a/contracts/pool_stable/src/tests/stake_deployment.rs +++ b/contracts/pool_stable/src/tests/stake_deployment.rs @@ -1,6 +1,6 @@ extern crate std; use phoenix::utils::{StakeInitInfo, TokenInitInfo}; -use soroban_sdk::{testutils::Address as _, Address, Env, String}; +use soroban_sdk::{Address, Env, String}; use super::setup::{deploy_stable_liquidity_pool_contract, deploy_token_contract}; use crate::contract::{StableLiquidityPool, StableLiquidityPoolClient}; @@ -16,8 +16,14 @@ fn confirm_stake_contract_deployment() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -25,7 +31,10 @@ fn confirm_stake_contract_deployment() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -76,9 +85,18 @@ fn second_pool_stable_deployment_should_fail() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); diff --git a/contracts/pool_stable/src/tests/swap.rs b/contracts/pool_stable/src/tests/swap.rs index 59be59834..907e67ed8 100644 --- a/contracts/pool_stable/src/tests/swap.rs +++ b/contracts/pool_stable/src/tests/swap.rs @@ -2,7 +2,7 @@ extern crate std; use pretty_assertions::assert_eq; use soroban_sdk::testutils::{AuthorizedFunction, AuthorizedInvocation}; -use soroban_sdk::{symbol_short, testutils::Address as _, Address, Env, String, IntoVal}; +use soroban_sdk::{symbol_short, Address, Env, IntoVal, String}; use super::setup::{deploy_stable_liquidity_pool_contract, deploy_token_contract}; use crate::storage::{Asset, PoolResponse, SimulateReverseSwapResponse, SimulateSwapResponse}; @@ -14,8 +14,14 @@ fn simple_swap() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -23,7 +29,10 @@ fn simple_swap() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 0i64; let pool = deploy_stable_liquidity_pool_contract( &env, @@ -128,8 +137,14 @@ fn swap_with_high_fee() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut admin1 = Address::from_string(&String::from_str(&env, "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44")); - let mut admin2 = Address::from_string(&String::from_str(&env, "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN")); + let mut admin1 = Address::from_string(&String::from_str( + &env, + "CALWS6SICRS42D6CANHJKDHFJWXL7M64W4MMV2TK4CQG5XTB2E5MYB44", + )); + let mut admin2 = Address::from_string(&String::from_str( + &env, + "CA6UCNJZDNEGR5QBZ5QSXZZO5FULEZNM6QIHRRABLX6WH4KIFF4OUIYN", + )); let mut token1 = deploy_token_contract(&env, &admin1); let mut token2 = deploy_token_contract(&env, &admin2); @@ -137,10 +152,16 @@ fn swap_with_high_fee() { std::mem::swap(&mut token1, &mut token2); std::mem::swap(&mut admin1, &mut admin2); } - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); let swap_fees = 1_000i64; // 10% bps - let fee_recipient = Address::from_string(&String::from_str(&env, "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267")); + let fee_recipient = Address::from_string(&String::from_str( + &env, + "CC4W4EIZMCCUG2R5FHQGQDSBZY6S2V2CIIJQZ5XBXCKUVVSBR7HC6267", + )); let pool = deploy_stable_liquidity_pool_contract( &env, None, @@ -204,8 +225,20 @@ fn swap_simulation_even_pool() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut token1 = deploy_token_contract(&env, &Address::from_string(&String::from_str(&env, "CAO3QRJ36VDS5IIA3XFO6EQTWFRDDB6SUYYXCKMTVIQRS75NSVLRRRRQ"))); - let mut token2 = deploy_token_contract(&env, &Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX"))); + let mut token1 = deploy_token_contract( + &env, + &Address::from_string(&String::from_str( + &env, + "CAO3QRJ36VDS5IIA3XFO6EQTWFRDDB6SUYYXCKMTVIQRS75NSVLRRRRQ", + )), + ); + let mut token2 = deploy_token_contract( + &env, + &Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )), + ); if token2.address < token1.address { std::mem::swap(&mut token1, &mut token2); } @@ -216,13 +249,19 @@ fn swap_simulation_even_pool() { None, (&token1.address, &token2.address), swap_fees, - Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")), + Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )), None, None, ); let initial_liquidity = 1_000_000i128; - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); token1.mint(&user1, &initial_liquidity); token2.mint(&user1, &initial_liquidity); pool.provide_liquidity( @@ -304,8 +343,20 @@ fn swap_simulation_one_third_pool() { env.mock_all_auths(); env.budget().reset_unlimited(); - let mut token1 = deploy_token_contract(&env, &Address::from_string(&String::from_str(&env, "CAO3QRJ36VDS5IIA3XFO6EQTWFRDDB6SUYYXCKMTVIQRS75NSVLRRRRQ"))); - let mut token2 = deploy_token_contract(&env, &Address::from_string(&String::from_str(&env, "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX"))); + let mut token1 = deploy_token_contract( + &env, + &Address::from_string(&String::from_str( + &env, + "CAO3QRJ36VDS5IIA3XFO6EQTWFRDDB6SUYYXCKMTVIQRS75NSVLRRRRQ", + )), + ); + let mut token2 = deploy_token_contract( + &env, + &Address::from_string(&String::from_str( + &env, + "CBGJMPOZ573XUTIRRFWGWTGSIAOGKJRVMIKBTFYEWTEIU7AEDWKDYMUX", + )), + ); if token2.address < token1.address { std::mem::swap(&mut token1, &mut token2); } @@ -316,13 +367,19 @@ fn swap_simulation_one_third_pool() { None, (&token1.address, &token2.address), swap_fees, - Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")), + Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )), None, None, ); let initial_liquidity = 1_000_000i128; - let user1 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); + let user1 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); token1.mint(&user1, &initial_liquidity); token2.mint(&user1, &(3 * initial_liquidity)); pool.provide_liquidity( diff --git a/contracts/stake/src/tests/bond.rs b/contracts/stake/src/tests/bond.rs index 5b3795f30..87d3b7dbe 100644 --- a/contracts/stake/src/tests/bond.rs +++ b/contracts/stake/src/tests/bond.rs @@ -1,7 +1,7 @@ use pretty_assertions::assert_eq; use soroban_sdk::{ testutils::{Address as _, Ledger}, - vec, Address, Env, String + vec, Address, Env, String, }; use super::setup::{deploy_staking_contract, deploy_token_contract}; @@ -16,7 +16,10 @@ fn initializa_staking_contract() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); + let admin = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); let lp_token = deploy_token_contract(&env, &admin); let staking = deploy_staking_contract(&env, admin.clone(), &lp_token.address); @@ -44,7 +47,10 @@ fn test_deploying_stake_twice_should_fail() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); + let admin = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); let lp_token = deploy_token_contract(&env, &admin); let first = deploy_staking_contract(&env, admin.clone(), &lp_token.address); @@ -165,7 +171,10 @@ fn initializing_contract_sets_total_staked_var() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H")); + let admin = Address::from_string(&String::from_str( + &env, + "GCHM6Y4BYTUJZQ4KABLTC73IWDZNFBZ2NML5W4AQG7XAJEOMLF5I774H", + )); let lp_token = deploy_token_contract(&env, &admin); let staking = deploy_staking_contract(&env, admin.clone(), &lp_token.address); diff --git a/contracts/stake/src/tests/distribution.rs b/contracts/stake/src/tests/distribution.rs index 42644f452..ada1e051f 100644 --- a/contracts/stake/src/tests/distribution.rs +++ b/contracts/stake/src/tests/distribution.rs @@ -1,7 +1,4 @@ -use soroban_sdk::{ - testutils::{Address as _, Ledger}, - vec, Address, Env, String, -}; +use soroban_sdk::{testutils::Ledger, vec, Address, Env, String}; use super::setup::{deploy_staking_contract, deploy_token_contract}; @@ -14,8 +11,14 @@ fn add_distribution_and_distribute_reward() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -84,8 +87,14 @@ fn two_distributions() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); let reward_token_2 = deploy_token_contract(&env, &admin); @@ -200,11 +209,26 @@ fn four_users_with_different_stakes() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - let user2 = Address::from_string(&String::from_str(&env, "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR")); - let user3 = Address::from_string(&String::from_str(&env, "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH")); - let user4 = Address::from_string(&String::from_str(&env, "CB6ODXXWE24XPHGTAVRKHCGKAEQS56BQF6EA7Q3MNSODFDWALW2LYTWF")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + let user2 = Address::from_string(&String::from_str( + &env, + "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR", + )); + let user3 = Address::from_string(&String::from_str( + &env, + "CAM3XZFCVAG6KJQUIAW2YWCGZQJ6CR6QIAQ5MAWU7GMM4ZZZCJ7JVDSH", + )); + let user4 = Address::from_string(&String::from_str( + &env, + "CB6ODXXWE24XPHGTAVRKHCGKAEQS56BQF6EA7Q3MNSODFDWALW2LYTWF", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -310,9 +334,18 @@ fn two_users_one_starts_after_distribution_begins() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - let user2 = Address::from_string(&String::from_str(&env, "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + let user2 = Address::from_string(&String::from_str( + &env, + "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -406,9 +439,18 @@ fn two_users_both_bonds_after_distribution_starts() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); - let user2 = Address::from_string(&String::from_str(&env, "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); + let user2 = Address::from_string(&String::from_str( + &env, + "CC7I4N5BYWO33MJ2G7OWZCAQ57SWETJOEUUR7GPVKMWKUXJFVBZWHOIR", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -531,7 +573,10 @@ fn fund_rewards_without_establishing_distribution() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -548,8 +593,14 @@ fn try_to_withdraw_rewards_without_bonding() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -606,7 +657,10 @@ fn fund_distribution_starting_before_current_timestamp() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -637,7 +691,10 @@ fn fund_distribution_with_reward_below_required_minimum() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); @@ -660,8 +717,14 @@ fn calculate_apr() { let env = Env::default(); env.mock_all_auths(); - let admin = Address::from_string(&String::from_str(&env, "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O")); - let user = Address::from_string(&String::from_str(&env, "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N")); + let admin = Address::from_string(&String::from_str( + &env, + "CBT4WEAHQ72AYRD7WZFNYE6HGZEIX25754NG37LBLXTTRMWKQNKIUR6O", + )); + let user = Address::from_string(&String::from_str( + &env, + "CDUK25UHLE7LUDQZ4UTTNWMXABJHW76Q74SKOK6BMWGKDHIJ6MIBOK6N", + )); let lp_token = deploy_token_contract(&env, &admin); let reward_token = deploy_token_contract(&env, &admin); diff --git a/contracts/stake/src/tests/setup.rs b/contracts/stake/src/tests/setup.rs index 228590499..7b9d247a8 100644 --- a/contracts/stake/src/tests/setup.rs +++ b/contracts/stake/src/tests/setup.rs @@ -1,4 +1,4 @@ -use soroban_sdk::{testutils::Address as _, Address, Env, String}; +use soroban_sdk::{Address, Env, String}; use crate::{ contract::{Staking, StakingClient}, @@ -19,7 +19,12 @@ pub fn deploy_staking_contract<'a>( admin: impl Into>, lp_token: &Address, ) -> StakingClient<'a> { - let admin = admin.into().unwrap_or(Address::from_string(&String::from_str(&env, "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE"))); + let admin = admin + .into() + .unwrap_or(Address::from_string(&String::from_str( + env, + "CDALIOEQHREN5DJANC3O6WN3KF2MVRXAYAWCKF3XJIBQJTFVXJHI6HWE", + ))); let staking = StakingClient::new(env, &env.register_contract(None, Staking {})); staking.initialize(&admin, lp_token, &MIN_BOND, &MAX_DISTRIBUTIONS, &MIN_REWARD);