fix test dependencies, run some tests in serial

securesecrets · Nov 27, 2023 · a8409f5 · a8409f5
1 parent bf8cc25
commit a8409f5
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 18 deletions.
diff --git a/contracts/liquidity_book/router/Cargo.toml b/contracts/liquidity_book/router/Cargo.toml
@@ -30,3 +30,4 @@ cosmwasm-schema = "1.5"
 
 [dev-dependencies]
 secret-multi-test = { git = "https://github.com/securesecrets/secret-plus-utils", version = "0.13.4", features=["iterator"] }
+serial_test = "2.0.0"
diff --git a/contracts/liquidity_book/router/src/test.rs b/contracts/liquidity_book/router/src/test.rs
@@ -5,6 +5,7 @@ pub mod tests {
         state::{config_r, epheral_storage_r, epheral_storage_w, Config, CurrentSwapInfo},
     };
     use serde::{Deserialize, Serialize};
+    use serial_test::serial;
     use shade_protocol::{
         admin::ValidateAdminPermissionResponse,
         c_std::{
@@ -14,6 +15,7 @@ pub mod tests {
             Addr,
             Api,
             Coin,
+            ContractResult,
             Empty,
             Env,
             OwnedDeps,
@@ -50,6 +52,7 @@ pub mod tests {
     pub const CUSTOM_TOKEN_1: &str = "secret1h92kweqxaxwwf3wny8qmcalsxe366s940eqd54";
 
     #[test]
+    #[serial]
     fn ok_init() -> StdResult<()> {
         let ref mut deps = mkdeps();
         let env = mock_env();
@@ -61,6 +64,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn swap_native_for_snip20_tokens_ok() -> StdResult<()> {
         let (init_result, mut deps) = init_helper();
         assert!(
@@ -117,6 +121,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn swap_snip20_native_for_tokens_ok() -> StdResult<()> {
         let (init_result, mut deps) = init_helper();
         let env = mock_env();
@@ -175,6 +180,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn snip20_swap() -> StdResult<()> {
         let mock_info = mock_info("admin", &[Coin {
             denom: "uscrt".to_string(),
@@ -250,6 +256,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn first_swap_callback_with_one_more_ok() -> StdResult<()> {
         let (init_result, mut deps) = init_helper();
         let env = mock_env();
@@ -342,6 +349,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn first_swap_callback_with_no_more_ok() -> StdResult<()> {
         let (init_result, mut deps) = init_helper();
         let env = mock_env();
@@ -427,6 +435,7 @@ pub mod tests {
     }
 
     #[test]
+    #[serial]
     fn first_swap_callback_with_no_more_not_enough_return() -> StdResult<()> {
         let (init_result, mut deps) = init_helper();
         let env = mock_env();
@@ -579,7 +588,7 @@ pub mod tests {
                     } => {
                         println!("{}", contract_addr);
                         match contract_addr.as_str() {
-                            FACTORY_ADDRESS => QuerierResult::Ok(cosmwasm_std::ContractResult::Ok(
+                            FACTORY_ADDRESS => QuerierResult::Ok(ContractResult::Ok(
                                 to_binary(&FactoryQueryResponse::GetConfig {
                                     pair_contract: ContractInstantiationInfo {
                                         code_hash: "".to_string(),
@@ -607,13 +616,13 @@ pub mod tests {
                                 })
                                 .unwrap(),
                             )),
-                            "admin_auth" => QuerierResult::Ok(cosmwasm_std::ContractResult::Ok(
+                            "admin_auth" => QuerierResult::Ok(ContractResult::Ok(
                                 to_binary(&ValidateAdminPermissionResponse {
                                     has_permission: true,
                                 })
                                 .unwrap(),
                             )),
-                            PAIR_CONTRACT_1 => QuerierResult::Ok(cosmwasm_std::ContractResult::Ok(
+                            PAIR_CONTRACT_1 => QuerierResult::Ok(ContractResult::Ok(
                                 to_binary(&AMMPairQueryMsgResponse::GetPairInfo {
                                     liquidity_token: Contract {
                                         address: Addr::unchecked("asd"),
@@ -662,7 +671,7 @@ pub mod tests {
                                 })
                                 .unwrap(),
                             )),
-                            CUSTOM_TOKEN_1 => QuerierResult::Ok(cosmwasm_std::ContractResult::Ok(
+                            CUSTOM_TOKEN_1 => QuerierResult::Ok(ContractResult::Ok(
                                 to_binary(&IntBalanceResponse {
                                     balance: Balance(Uint128::new(100)),
                                 })

diff --git a/contracts/liquidity_book/tests/Cargo.toml b/contracts/liquidity_book/tests/Cargo.toml
@@ -37,3 +37,4 @@ shade-multi-test = { path = "../../../packages/multi_test", features = [
   "router",
   "lb_factory"
 ] }
+serial_test = "2.0.0"
diff --git a/contracts/liquidity_book/tests/src/multitests/lb_factory.rs b/contracts/liquidity_book/tests/src/multitests/lb_factory.rs
@@ -1,10 +1,11 @@
 use anyhow::Ok;
-use cosmwasm_std::{ContractInfo, StdError};
+use serial_test::serial;
 use shade_multi_test::{
     interfaces::{lb_factory, lb_pair, snip20},
     multi::{admin::init_admin_auth, lb_pair::LbPair, lb_token::LbToken},
 };
 use shade_protocol::{
+    c_std::{ContractInfo, StdError},
     lb_libraries::{
         constants::BASIS_POINT_MAX,
         math::{
@@ -20,6 +21,7 @@ use shade_protocol::{
 use crate::multitests::test_helper::*;
 
 #[test]
+#[serial]
 pub fn test_setup() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -42,6 +44,7 @@ pub fn test_setup() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -61,6 +64,7 @@ pub fn test_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_revert_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -93,6 +97,7 @@ pub fn test_revert_set_lb_pair_implementation() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_set_lb_token_implementation() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -111,6 +116,7 @@ pub fn test_set_lb_token_implementation() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_create_lb_pair() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, deployed_contracts) = setup(None)?;
@@ -199,6 +205,7 @@ pub fn test_create_lb_pair() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_create_lb_pair_factory_unlocked() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, deployed_contracts) = setup(None)?;
@@ -290,6 +297,7 @@ pub fn test_create_lb_pair_factory_unlocked() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, deployed_contracts) = setup(None)?;
@@ -500,6 +508,7 @@ fn test_revert_create_lb_pair() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 fn test_fuzz_set_preset() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -575,6 +584,7 @@ fn test_fuzz_set_preset() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 fn test_remove_preset() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -656,6 +666,7 @@ fn test_remove_preset() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_set_fees_parameters_on_pair() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, deployed_contracts) = setup(None)?;
@@ -778,6 +789,7 @@ pub fn test_set_fees_parameters_on_pair() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_set_fee_recipient() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?;
@@ -818,6 +830,7 @@ pub fn test_set_fee_recipient() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_fuzz_open_presets() -> Result<(), anyhow::Error> {
     let addrs = init_addrs(); // Initialize addresses
     let (mut app, lb_factory, _deployed_contracts) = setup(None)?; // Setup
@@ -916,6 +929,7 @@ pub fn test_fuzz_open_presets() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_add_quote_asset() -> Result<(), anyhow::Error> {
     let addrs = init_addrs(); // Initialize addresses
     let (mut app, lb_factory, mut deployed_contracts) = setup(None)?; // Setup
@@ -1032,6 +1046,7 @@ pub fn test_add_quote_asset() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_remove_quote_asset() -> Result<(), anyhow::Error> {
     let addrs = init_addrs(); // Initialize addresses
     let (mut app, lb_factory, mut deployed_contracts) = setup(None)?; // Setup
@@ -1126,6 +1141,7 @@ pub fn test_remove_quote_asset() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_force_decay() -> Result<(), anyhow::Error> {
     let addrs = init_addrs(); // Initialize addresses
     let (mut app, lb_factory, deployed_contracts) = setup(None)?; // Setup
@@ -1175,6 +1191,7 @@ pub fn test_force_decay() -> Result<(), anyhow::Error> {
 }
 
 #[test]
+#[serial]
 pub fn test_get_all_lb_pair() -> Result<(), anyhow::Error> {
     let addrs = init_addrs();
     let (mut app, lb_factory, deployed_contracts) = setup(None)?;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,4 @@ cosmwasm-schema = "1.5"

		[dev-dependencies]
		secret-multi-test = { git = "https://github.com/securesecrets/secret-plus-utils", version = "0.13.4", features=["iterator"] }
		serial_test = "2.0.0"