fix and add tests

Author: Art3miX

contracts/auction/price_oracle/src/contract.rs

@@ -323,8 +323,8 @@ fn get_price_from_astroport(
                     .checked_add(res.spread_amount)?,
                 0,
             )?;
-            deps.api.debug(format!("res: {:?}", res).as_str());
-            deps.api.debug(format!("Price step: {:?}", price).as_str());
+            // deps.api.debug(format!("res: {:?}", res).as_str());
+            // deps.api.debug(format!("Price step: {:?}", price).as_str());
 
             Ok(price)
         },

tests/rust-tests/src/suite/suite_auction.rs

@@ -690,6 +690,16 @@ impl Suite {
             .unwrap()
     }
 
+    pub fn query_oracle_local_price(&self, pair: Pair) -> Vec<GetPriceResponse> {
+        self.app
+            .wrap()
+            .query_wasm_smart(
+                self.oracle_addr.clone(),
+                &price_oracle::msg::QueryMsg::GetLocalPrice { pair },
+            )
+            .unwrap()
+    }
+
     pub fn query_oracle_all_prices(
         &self,
         from: Option<Pair>,

tests/rust-tests/src/tests_auctions/test_astro.rs

@@ -45,7 +45,7 @@ fn test_add_path_for_pair() {
 fn test_basic_astro_default() {
     let mut suite = SuiteBuilder::default().build_basic(true);
 
-    let old_oracle_price = suite.query_oracle_price(suite.pair.clone());
+    let old_oracle_last_local_price = suite.query_oracle_local_price(suite.pair.clone())[0].clone();
     // This should error because we don't have astro path for the price yet
     // and no auction ran so far
     let err = suite.update_price_err(suite.pair.clone());
@@ -91,16 +91,16 @@ fn test_basic_astro_default() {
 
     // Make sure the pool price is not the same as the old price
     // To confirm the price actually changed later
-    assert_ne!(pool_price, old_oracle_price.price);
+    assert_ne!(pool_price, old_oracle_last_local_price.price);
 
     // Try to update again
     suite.update_price(suite.pair.clone()).unwrap();
 
     // Verify we do get an acceptable price (query price from pool)
-    let oracle_price = suite.query_oracle_price(suite.pair.clone());
+    let oracle_last_local_price = suite.query_oracle_local_price(suite.pair.clone())[0].clone();
     println!("pool_price: {:?}", pool_price);
-    println!("oracle_price: {:?}", oracle_price);
-    assert_eq!(oracle_price.price, pool_price);
+    println!("oracle_price: {:?}", oracle_last_local_price);
+    assert_eq!(oracle_last_local_price.price, pool_price);
 }
 
 // Test for a pair that doesn't have a direct pool, so the astro path is 2 pools

tests/rust-tests/src/tests_auctions/test_oracle.rs

@@ -1,6 +1,9 @@
+use std::borrow::BorrowMut;
+
 use cosmwasm_std::{coins, Addr, Decimal};
 use cw_multi_test::Executor;
 use cw_utils::Expiration;
+use price_oracle::state::PriceStep;
 
 use crate::suite::{
     suite::{Suite, DAY, DEFAULT_BLOCK_TIME},
@@ -323,3 +326,77 @@ fn test_update_config() {
     assert_eq!(new_oracle_config.seconds_allow_manual_change, 12);
     assert_eq!(new_oracle_config.seconds_auction_prices_fresh, 455);
 }
+
+#[test]
+fn test_local_prices() {
+    let mut suite = Suite::default();
+    let funds = coins(100_u128, suite.pair.0.clone());
+
+    // do 3 auctions
+    suite.finalize_auction(&funds);
+    suite.finalize_auction(&funds);
+    suite.finalize_auction(&funds);
+
+    // Update the price from auction
+    suite.update_price(suite.pair.clone()).unwrap();
+
+    // Register the astro path
+    let path = vec![PriceStep {
+        denom1: suite.pair.0.to_string(),
+        denom2: suite.pair.1.to_string(),
+        pool_address: suite
+            .astro_pools
+            .get(&suite.pair.clone().into())
+            .unwrap()
+            .clone(),
+    }];
+    suite
+        .add_astro_path_to_oracle(suite.pair.clone(), path)
+        .unwrap();
+
+    // Randomize the pool a little to get a "nice" price
+    let mut rng = rand::thread_rng();
+
+    for _ in 0..10 {
+        suite.do_random_swap(
+            rng.borrow_mut(),
+            suite.pair.clone(),
+            100_000_u128,
+            1_000_000_u128,
+        );
+    }
+
+    let pool_price = suite.query_astro_pool_price(
+        suite
+            .astro_pools
+            .get(&suite.pair.clone().into())
+            .unwrap()
+            .clone(),
+        suite.pair.clone(),
+    );
+
+    // make sure the last price on local, is not the price from the pool
+    let local_prices = suite.query_oracle_local_price(suite.pair.clone());
+    assert_ne!(local_prices[0].price, pool_price);
+
+    // Update price, should get it from astro
+    suite.update_block(DAY / DEFAULT_BLOCK_TIME * 2);
+
+    // Update the price from auction
+    suite.update_price(suite.pair.clone()).unwrap();
+
+    let local_prices = suite.query_oracle_local_price(suite.pair.clone());
+
+    // We should have 2 prices because we updated prices twice
+    assert_eq!(local_prices.len(), 3);
+    // The first price should be the pool price
+    assert_eq!(local_prices[0].price, pool_price);
+
+    // make sure the actual price is the avg of the local prices
+    let oracle_price = suite.query_oracle_price(suite.pair.clone());
+    assert_eq!(
+        oracle_price.price,
+        (local_prices[0].price + local_prices[1].price + local_prices[2].price)
+            / Decimal::from_atomics(3_u128, 0).unwrap()
+    );
+}