Merge pull request #2337 from get10101/chore/remove-dlc-expiry-timestamp

chore: Remove unused dlc expiry timestamp from trades

Author: holzeis

Diff for: coordinator/migrations/2024-03-28-111100_remove_dlc_expiry_timestamp/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "trades"
+    ADD COLUMN dlc_expiry_timestamp timestamp WITH TIME ZONE;

Diff for: coordinator/migrations/2024-03-28-111100_remove_dlc_expiry_timestamp/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "trades"
+    DROP COLUMN IF EXISTS "dlc_expiry_timestamp";

Diff for: coordinator/src/db/trades.rs

@@ -21,7 +21,6 @@ struct Trade {
     direction: Direction,
     average_price: f32,
     timestamp: OffsetDateTime,
-    dlc_expiry_timestamp: Option<OffsetDateTime>,
     order_matching_fee_sat: i64,
 }
 
@@ -36,7 +35,6 @@ struct NewTrade {
     collateral: i64,
     direction: Direction,
     average_price: f32,
-    dlc_expiry_timestamp: Option<OffsetDateTime>,
     order_matching_fee_sat: i64,
 }
 
@@ -75,7 +73,6 @@ impl From<crate::trade::models::NewTrade> for NewTrade {
             collateral: value.coordinator_margin,
             direction: value.trader_direction.into(),
             average_price: value.average_price,
-            dlc_expiry_timestamp: value.dlc_expiry_timestamp,
             order_matching_fee_sat: value.order_matching_fee.to_sat() as i64,
         }
     }
@@ -95,7 +92,6 @@ impl From<Trade> for crate::trade::models::Trade {
             direction: value.direction.into(),
             average_price: value.average_price,
             timestamp: value.timestamp,
-            dlc_expiry_timestamp: value.dlc_expiry_timestamp,
             order_matching_fee: Amount::from_sat(value.order_matching_fee_sat as u64),
         }
     }

Diff for: coordinator/src/dlc_protocol.rs

@@ -411,7 +411,6 @@ impl DlcProtocolExecutor {
             coordinator_margin: coordinator_margin as i64,
             trader_direction: trade_params.direction,
             average_price: trade_params.average_price,
-            dlc_expiry_timestamp: None,
             order_matching_fee,
         };
 
@@ -474,7 +473,6 @@ impl DlcProtocolExecutor {
             coordinator_margin: coordinator_margin as i64,
             trader_direction: trade_params.direction,
             average_price: trade_params.average_price,
-            dlc_expiry_timestamp: None,
             order_matching_fee,
         };
 

Diff for: coordinator/src/schema.rs

@@ -398,7 +398,6 @@ diesel::table! {
         direction -> DirectionType,
         average_price -> Float4,
         timestamp -> Timestamptz,
-        dlc_expiry_timestamp -> Nullable<Timestamptz>,
         order_matching_fee_sat -> Int8,
     }
 }

Diff for: coordinator/src/trade/models.rs

@@ -15,7 +15,6 @@ pub struct NewTrade {
     pub coordinator_margin: i64,
     pub trader_direction: Direction,
     pub average_price: f32,
-    pub dlc_expiry_timestamp: Option<OffsetDateTime>,
     pub order_matching_fee: Amount,
 }
 
@@ -31,10 +30,6 @@ pub struct Trade {
     pub collateral: i64,
     pub direction: Direction,
     pub average_price: f32,
-    // We need this for position resizing so that we can set up the DLC channel using the expiry
-    // timestamp specified in the `TradeParams`. It should probably go in a different table since
-    // it's not part of the trade model.
-    pub dlc_expiry_timestamp: Option<OffsetDateTime>,
     pub timestamp: OffsetDateTime,
     pub order_matching_fee: Amount,
 }