chore: switch KlinesRange to have Optional end_time

Author: valeratrades

.github/workflows/errors.yml

@@ -17,19 +17,6 @@ jobs:
     - uses: dtolnay/install@cargo-docs-rs
     - run: cargo docs-rs
     timeout-minutes: 45
-  miri:
-    if: needs.pre_ci.outputs.continue
-    name: Miri
-    needs: pre_ci
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: dtolnay/rust-toolchain@miri
-    - run: cargo miri setup
-    - env:
-        MIRIFLAGS: -Zmiri-strict-provenance
-      run: cargo miri test
-    timeout-minutes: 45
   pre_ci:
     uses: valeratrades/.github/.github/workflows/pre_ci.yml@master
   tests:

.github/workflows/warnings.yml

@@ -20,6 +20,8 @@ jobs:
       run: "\t\t\t\t\t\tcargo machete\n\t\t\t\t\t\texit_code=$?\n\t\t\t\t\t\tif [\
         \ $exit_code = 0 ]; then\n\t\t\t\t\t\t\techo \"Found unused dependencies\"\
         \n\t\t\t\t\t\t\texit $exit_code\n\t\t\t\t\t\tfi\n\t\t\t"
+  pre_ci:
+    uses: valeratrades/.github/.github/workflows/pre_ci.yml@master
   sort:
     name: Cargo Sorted
     runs-on: ubuntu-latest

v_exchanges/src/binance/futures/market.rs

@@ -23,7 +23,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 	let range_json = match range {
 		KlinesRequestRange::StartEnd { start, end } => json!({
 			"startTime": start.timestamp_millis(),
-			"endTime": end.timestamp_millis(),
+			"endTime": end.map(|dt| dt.timestamp_millis()),
 		}),
 		KlinesRequestRange::Limit(limit) => {
 			let allowed_range = 1..=1000;
@@ -35,7 +35,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 			})
 		}
 	};
-	let mut base_params = filter_nulls(json!({
+	let base_params = filter_nulls(json!({
 		"symbol": pair.to_string(),
 		"interval": tf.format_binance()?,
 	}));

v_exchanges/src/bybit/market.rs

@@ -1,11 +1,8 @@
-use std::fmt;
-
-use chrono::{DateTime, TimeZone, Utc};
+use chrono::{TimeZone, Utc};
 use color_eyre::eyre::Result;
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use serde_with::{DisplayFromStr, serde_as};
-use thiserror::Error;
 use v_exchanges_adapters::{
 	bybit::{BybitHttpUrl, BybitOption},
 	errors::LimitOutOfRangeError,
@@ -22,7 +19,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 	let range_json = match range {
 		KlinesRequestRange::StartEnd { start, end } => json!({
 			"startTime": start.timestamp_millis(),
-			"endTime": end.timestamp_millis(),
+			"endTime": end.map(|dt| dt.timestamp_millis()),
 		}),
 		KlinesRequestRange::Limit(limit) => {
 			let allowed_range = 1..=1000;
@@ -34,7 +31,7 @@ pub async fn klines(client: &v_exchanges_adapters::Client, pair: Pair, tf: Timef
 			})
 		}
 	};
-	let mut base_params = filter_nulls(json!({
+	let base_params = filter_nulls(json!({
 		"category": "linear", // can be ["linear", "inverse", "spot"] afaiu, could drive some generics with this later, but for now hardcode
 		"symbol": pair.to_string(),
 		"interval": tf.format_bybit()?,

v_exchanges/src/core.rs

@@ -1,7 +1,5 @@
-use chrono::{DateTime, Utc};
-use color_eyre::eyre::{Error, Result};
-use tokio::sync::mpsc;
-use v_exchanges_adapters::traits::HandlerOptions;
+use chrono::{DateTime, TimeDelta, Utc};
+use color_eyre::eyre::Result;
 use v_utils::trades::{Asset, Kline, Pair, Timeframe};
 use derive_more::{Deref, DerefMut};
 
@@ -60,15 +58,30 @@ impl TryFrom<Klines> for FullKlines {
 #[derive(Clone, Debug, Copy)]
 pub enum KlinesRequestRange {
 	/// Preferred way of defining the range
-	StartEnd { start: DateTime<Utc>, end: DateTime<Utc> },
+	StartEnd { start: DateTime<Utc>, end: Option<DateTime<Utc>> },
 	/// For quick and dirty
 	Limit(u32),
 }
 impl Default for KlinesRequestRange {
 	fn default() -> Self {
 		KlinesRequestRange::StartEnd {
 			start: DateTime::default(),
-			end: DateTime::default(),
+			end: None,
+		}
+	}
+}
+impl From<DateTime<Utc>> for KlinesRequestRange {
+	fn from(value: DateTime<Utc>) -> Self {
+		KlinesRequestRange::StartEnd { start: value, end: None }
+	}
+}
+/// funky
+impl From<TimeDelta> for KlinesRequestRange {
+	fn from(value: TimeDelta) -> Self {
+		let now = Utc::now();
+		KlinesRequestRange::StartEnd {
+			start: now - value,
+			end: None,
 		}
 	}
 }
@@ -77,16 +90,26 @@ impl From<u32> for KlinesRequestRange {
 		KlinesRequestRange::Limit(value)
 	}
 }
+impl From<u16> for KlinesRequestRange {
+	fn from(value: u16) -> Self {
+		KlinesRequestRange::Limit(value as u32)
+	}
+}
+impl From<u8> for KlinesRequestRange {
+	fn from(value: u8) -> Self {
+		KlinesRequestRange::Limit(value as u32)
+	}
+}
 impl From<(DateTime<Utc>, DateTime<Utc>)> for KlinesRequestRange {
 	fn from(value: (DateTime<Utc>, DateTime<Utc>)) -> Self {
-		KlinesRequestRange::StartEnd { start: value.0, end: value.1 }
+		KlinesRequestRange::StartEnd { start: value.0, end: Some(value.1) }
 	}
 }
 impl From<(i64, i64)> for KlinesRequestRange {
 	fn from(value: (i64, i64)) -> Self {
 		KlinesRequestRange::StartEnd {
 			start: DateTime::from_timestamp_millis(value.0).unwrap(),
-			end: DateTime::from_timestamp_millis(value.1).unwrap(),
+			end: Some(DateTime::from_timestamp_millis(value.1).unwrap()),
 		}
 	}
 }