Fix clippy lints and formatting

Phoenix-Protocol-Group · Jan 9, 2024 · 240c321 · 240c321
1 parent a5d843a
commit 240c321
Show file tree

Hide file tree

Showing 21 changed files with 739 additions and 194 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -38,7 +38,12 @@ pub fn deploy_factory_contract<'a>(
     env: &Env,
     admin: impl Into<Option<Address>>,
 ) -> 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
@@ -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
@@ -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
@@ -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());