Revert "feat: weighted price from order book cache (#181)" (#196)

This reverts commit 952850c.

cli/src/health.rs

@@ -51,7 +51,7 @@ async fn health_check_error(
     *n_errors += 1;
     let span = tracing::Span::current();
     span.record("component_name", name);
-    span.record("n_errors", *n_errors);
+    span.record("n_errors", &*n_errors);
     span.record("error.message", tracing::field::display(&err));
     if *n_errors > 4 {
         span.record(

price-server/src/app/error.rs

@@ -1,6 +1,6 @@
 use thiserror::Error;
 
-use crate::{currency::CurrencyError, order_book_cache::OrderBookCacheError};
+use crate::{currency::CurrencyError, exchange_price_cache::ExchangePriceCacheError};
 use shared::pubsub::SubscriberError;
 
 #[allow(clippy::large_enum_variant)]
@@ -10,8 +10,6 @@ pub enum PriceAppError {
     CurrencyError(#[from] CurrencyError),
     #[error("PriceAppError - SubscriberError: {0}")]
     SubscriberError(#[from] SubscriberError),
-    #[error("PriceAppError - SnapshotCacheError: {0}")]
-    OrderBookCacheError(#[from] OrderBookCacheError),
-    #[error("PriceAppError - FloatingPointConversion: {0}")]
-    FloatingPointConversion(#[from] rust_decimal::Error),
+    #[error("PriceAppError - ExchangePriceCacheError: {0}")]
+    ExchangePriceCacheError(#[from] ExchangePriceCacheError),
 }

price-server/src/app/mod.rs

@@ -4,14 +4,15 @@ use chrono::Duration;
 use futures::stream::StreamExt;
 use tracing::{info_span, instrument, Instrument};
 
-use shared::{health::HealthCheckTrigger, payload::OkexBtcUsdSwapOrderBookPayload, pubsub::*};
+use shared::{health::HealthCheckTrigger, payload::OkexBtcUsdSwapPricePayload, pubsub::*};
+
+use super::exchange_price_cache::ExchangePriceCache;
 
-use crate::OrderBookCache;
 pub use crate::{currency::*, fee_calculator::*};
 pub use error::*;
 
 pub struct PriceApp {
-    snapshot_cache: OrderBookCache,
+    price_cache: ExchangePriceCache,
     fee_calculator: FeeCalculator,
 }
 
@@ -22,9 +23,7 @@ impl PriceApp {
         pubsub_cfg: PubSubConfig,
     ) -> Result<Self, PriceAppError> {
         let subscriber = Subscriber::new(pubsub_cfg).await?;
-        let mut stream = subscriber
-            .subscribe::<OkexBtcUsdSwapOrderBookPayload>()
-            .await?;
+        let mut stream = subscriber.subscribe::<OkexBtcUsdSwapPricePayload>().await?;
         tokio::spawn(async move {
             while let Some(check) = health_check_trigger.next().await {
                 check
@@ -33,10 +32,10 @@ impl PriceApp {
             }
         });
 
-        let order_book_cache = OrderBookCache::new(Duration::seconds(30));
+        let price_cache = ExchangePriceCache::new(Duration::seconds(30));
         let fee_calculator = FeeCalculator::new(fee_calc_cfg);
         let app = Self {
-            snapshot_cache: order_book_cache.clone(),
+            price_cache: price_cache.clone(),
             fee_calculator,
         };
 
@@ -50,7 +49,7 @@ impl PriceApp {
                 shared::tracing::inject_tracing_data(&span, &msg.meta.tracing_data);
 
                 async {
-                    order_book_cache.apply_update(msg).await;
+                    price_cache.apply_update(msg).await;
                 }
                 .instrument(span)
                 .await;
@@ -65,8 +64,8 @@ impl PriceApp {
         sats: Sats,
     ) -> Result<UsdCents, PriceAppError> {
         let cents = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .buy_usd()
             .cents_from_sats(sats);
@@ -79,8 +78,8 @@ impl PriceApp {
         sats: Sats,
     ) -> Result<UsdCents, PriceAppError> {
         let cents = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .sell_usd()
             .cents_from_sats(sats);
@@ -93,8 +92,8 @@ impl PriceApp {
         sats: Sats,
     ) -> Result<UsdCents, PriceAppError> {
         let cents = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .buy_usd()
             .cents_from_sats(sats);
@@ -107,8 +106,8 @@ impl PriceApp {
         sats: Sats,
     ) -> Result<UsdCents, PriceAppError> {
         let cents = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .sell_usd()
             .cents_from_sats(sats);
@@ -121,8 +120,8 @@ impl PriceApp {
         cents: UsdCents,
     ) -> Result<Sats, PriceAppError> {
         let sats = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .buy_usd()
             .sats_from_cents(cents);
@@ -135,8 +134,8 @@ impl PriceApp {
         cents: UsdCents,
     ) -> Result<Sats, PriceAppError> {
         let sats = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .sell_usd()
             .sats_from_cents(cents);
@@ -149,8 +148,8 @@ impl PriceApp {
         cents: UsdCents,
     ) -> Result<Sats, PriceAppError> {
         let sats = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .buy_usd()
             .sats_from_cents(cents);
@@ -163,8 +162,8 @@ impl PriceApp {
         cents: UsdCents,
     ) -> Result<Sats, PriceAppError> {
         let sats = self
-            .snapshot_cache
-            .latest_snapshot()
+            .price_cache
+            .latest_tick()
             .await?
             .sell_usd()
             .sats_from_cents(cents);
@@ -173,11 +172,7 @@ impl PriceApp {
 
     #[instrument(skip_all, fields(correlation_id), ret, err)]
     pub async fn get_cents_per_sat_exchange_mid_rate(&self) -> Result<f64, PriceAppError> {
-        let cents_per_sat = self
-            .snapshot_cache
-            .latest_snapshot()
-            .await?
-            .mid_price_of_one_sat()?;
+        let cents_per_sat = self.price_cache.latest_tick().await?.mid_price_of_one_sat();
         Ok(f64::try_from(cents_per_sat)?)
     }
 }

price-server/src/currency/mod.rs

@@ -15,7 +15,7 @@ pub enum CurrencyError {
 
 macro_rules! currency {
     ($name:ident, $code:ident) => {
-        #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+        #[derive(Clone, Debug, PartialEq, Eq)]
         pub struct $name {
             inner: Money<'static, inner::stablesats::Currency>,
         }

price-server/src/exchange_price_cache.rs

@@ -23,12 +23,10 @@ pub enum ExchangePriceCacheError {
 }
 
 #[derive(Clone)]
-#[allow(dead_code)]
 pub struct ExchangePriceCache {
     inner: Arc<RwLock<ExchangePriceCacheInner>>,
 }
 
-#[allow(dead_code)]
 impl ExchangePriceCache {
     pub fn new(stale_after: Duration) -> Self {
         Self {
@@ -53,7 +51,6 @@ impl ExchangePriceCache {
 }
 
 #[derive(Clone)]
-#[allow(dead_code)]
 pub struct BtcSatTick {
     timestamp: TimeStamp,
     correlation_id: CorrelationId,
@@ -62,7 +59,6 @@ pub struct BtcSatTick {
     bid_price_of_one_sat: UsdCents,
 }
 
-#[allow(dead_code)]
 impl BtcSatTick {
     pub fn mid_price_of_one_sat(&self) -> UsdCents {
         (&self.bid_price_of_one_sat + &self.ask_price_of_one_sat) / 2

price-server/src/lib.rs

@@ -5,17 +5,13 @@ pub mod app;
 pub mod currency;
 mod exchange_price_cache;
 mod fee_calculator;
-mod order_book_cache;
-mod price_converter;
 mod server;
 
 use shared::{health::HealthCheckTrigger, pubsub::PubSubConfig};
 
 use app::PriceApp;
 pub use exchange_price_cache::ExchangePriceCacheError;
 pub use fee_calculator::FeeCalculatorConfig;
-pub use order_book_cache::*;
-pub use price_converter::*;
 pub use server::*;
 
 pub async fn run(