refactor(test): Refactored tests to leave up to the caller whether to…

… clone address
nolus-protocol · May 25, 2023 · 5f97de4 · 5f97de4
1 parent 57983f2
commit 5f97de4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/tests/src/common/oracle_wrapper.rs b/tests/src/common/oracle_wrapper.rs
@@ -126,7 +126,7 @@ where
 
 pub fn feed_a_price<Lpn, C1, C2>(
     test_case: &mut TestCase<Lpn>,
-    addr: &Addr,
+    addr: Addr,
     price: Price<C1, C2>,
 ) -> AppResponse
 where
@@ -137,7 +137,7 @@ where
     test_case
         .app
         .execute(
-            addr.clone(),
+            addr,
             wasm_execute(
                 test_case.oracle.clone().unwrap(),
                 &ExecuteMsg::FeedPrices {
@@ -153,7 +153,7 @@ where
 
 pub fn feed_price<Lpn, C1, C2>(
     test_case: &mut TestCase<Lpn>,
-    addr: &Addr,
+    addr: Addr,
     base: Coin<C1>,
     quote: Coin<C2>,
 ) -> AppResponse

diff --git a/tests/src/lease_tests.rs b/tests/src/lease_tests.rs
@@ -55,10 +55,10 @@ where
 
 fn feed_price(test_case: &mut TestCase<Lpn>) {
     let lease_price = price_lpn_of::<LeaseCurrency>();
-    oracle_feed_a_price(test_case, &Addr::unchecked(ADMIN), lease_price);
+    oracle_feed_a_price(test_case, Addr::unchecked(ADMIN), lease_price);
 
     let payment_price = price_lpn_of::<PaymentCurrency>();
-    oracle_feed_a_price(test_case, &Addr::unchecked(ADMIN), payment_price);
+    oracle_feed_a_price(test_case, Addr::unchecked(ADMIN), payment_price);
 }
 
 fn create_test_case<InitFundsC>() -> TestCase<Lpn>
@@ -502,7 +502,7 @@ fn liquidation_warning(base: LeaseCoin, quote: LpnCoin, liability: Percent, leve
     let downpayment = create_payment_coin(DOWNPAYMENT);
     let lease_address = open_lease(&mut test_case, downpayment, None);
 
-    oracle_feed_price(&mut test_case, &Addr::unchecked(ADMIN), base, quote);
+    oracle_feed_price(&mut test_case, Addr::unchecked(ADMIN), base, quote);
 
     let response = test_case
         .app

diff --git a/tests/src/leaser_tests.rs b/tests/src/leaser_tests.rs
@@ -253,7 +253,7 @@ fn test_quote() {
 
     let price_lease_lpn: Price<LeaseCurrency, Lpn> = price::total_of(2.into()).is(1.into());
     let feeder = setup_feeder(&mut test_case);
-    feed_price::<_, LeaseCurrency, Lpn>(&mut test_case, &feeder, Coin::new(2), Coin::new(1));
+    feed_price::<_, LeaseCurrency, Lpn>(&mut test_case, feeder, Coin::new(2), Coin::new(1));
 
     let leaser = test_case.leaser();
     let downpayment = Coin::new(100);
@@ -350,10 +350,15 @@ fn common_quote_with_conversion(downpayment: Coin<Osmo>, borrow_after_mul2: Coin
     let lpn_asset_quote = Coin::<LeaseCurrency>::new(2);
     let lpn_asset_price = total_of(lpn_asset_base).is(lpn_asset_quote);
 
-    feed_price::<_, Osmo, TheCurrency>(&mut test_case, &feeder_addr, dpn_lpn_base, dpn_lpn_quote);
+    feed_price::<_, Osmo, TheCurrency>(
+        &mut test_case,
+        feeder_addr.clone(),
+        dpn_lpn_base,
+        dpn_lpn_quote,
+    );
     feed_price::<_, LeaseCurrency, TheCurrency>(
         &mut test_case,
-        &feeder_addr,
+        feeder_addr,
         lpn_asset_quote,
         lpn_asset_base,
     );
@@ -425,7 +430,7 @@ fn test_quote_fixed_rate() {
     test_case.init_leaser();
 
     let feeder = setup_feeder(&mut test_case);
-    feed_price::<_, LeaseCurrency, Lpn>(&mut test_case, &feeder, Coin::new(3), Coin::new(1));
+    feed_price::<_, LeaseCurrency, Lpn>(&mut test_case, feeder, Coin::new(3), Coin::new(1));
     let resp = leaser_wrapper::query_quote::<Lpn, Downpayment, LeaseCurrency>(
         &mut test_case.app,
         test_case.leaser_addr.clone().unwrap(),
@@ -558,7 +563,7 @@ where
         if !finance::currency::equal::<DownpaymentC, Lpn>() {
             feed_price(
                 &mut test_case,
-                &user_addr,
+                user_addr.clone(),
                 Coin::<DownpaymentC>::new(1),
                 Coin::<Lpn>::new(1),
             );
@@ -567,7 +572,7 @@ where
         if !finance::currency::equal::<LeaseC, Lpn>() {
             feed_price(
                 &mut test_case,
-                &user_addr,
+                user_addr.clone(),
                 Coin::<LeaseC>::new(1),
                 Coin::<Lpn>::new(1),
             );
@@ -586,7 +591,7 @@ where
     test_case
         .app
         .execute_contract(
-            user_addr.clone(),
+            user_addr,
             leaser_addr,
             &leaser::msg::ExecuteMsg::OpenLease {
                 currency: LeaseC::TICKER.into(),

diff --git a/tests/src/oracle_tests.rs b/tests/src/oracle_tests.rs
@@ -1,5 +1,7 @@
 use std::collections::HashSet;
 
+use serde_json_wasm::from_str;
+
 use currency::{
     lease::{Atom, Cro, Osmo, Wbtc, Weth},
     lpn::Usdc,
@@ -96,7 +98,7 @@ fn internal_test_integration_setup_test() {
 
     let response: AppResponse = oracle_wrapper::feed_price::<_, BaseC, Usdc>(
         &mut test_case,
-        &Addr::unchecked(ADMIN),
+        Addr::unchecked(ADMIN),
         Coin::new(5),
         Coin::new(7),
     );
@@ -135,7 +137,7 @@ fn feed_price_with_alarm_issue() {
 
     let _ = oracle_wrapper::feed_price::<_, BaseC, Usdc>(
         &mut test_case,
-        &Addr::unchecked(ADMIN),
+        Addr::unchecked(ADMIN),
         Coin::new(5),
         Coin::new(7),
     );
@@ -167,7 +169,7 @@ fn feed_price_with_alarm() {
 
     let res = oracle_wrapper::feed_price::<_, Cro, Usdc>(
         &mut test_case,
-        &Addr::unchecked(ADMIN),
+        Addr::unchecked(ADMIN),
         Coin::new(1),
         Coin::new(5),
     );
@@ -252,13 +254,13 @@ fn test_config_update() {
 
     oracle_wrapper::feed_price::<_, BaseC, Usdc>(
         &mut test_case,
-        &feeder1,
+        feeder1,
         Coin::new(base),
         Coin::new(quote),
     );
     oracle_wrapper::feed_price::<_, BaseC, Usdc>(
         &mut test_case,
-        &feeder2,
+        feeder2,
         Coin::new(base),
         Coin::new(quote),
     );
@@ -309,7 +311,7 @@ fn test_config_update() {
 }
 
 fn swap_tree() -> HumanReadableTree<SwapTarget> {
-    serde_json_wasm::from_str(&format!(
+    from_str(&format!(
         r#"{{
                 "value":[0,"{usdc}"],
                 "children":[