_

Author: valeratrades

Cargo.lock

@@ -8,7 +8,6 @@
 [<img alt="ci warnings" src="https://img.shields.io/github/actions/workflow/status/valeratrades/discretionary_engine/warnings.yml?branch=master&style=for-the-badge&style=flat-square&label=warnings&labelColor=d16002" height="20">](https://github.com/valeratrades/discretionary_engine/actions?query=branch%3Amaster) <!--NB: Won't find it if repo is private-->
 
 Places and follows a position from a definition of _what the target position is_
-If the broader architecture is of interest, see [ARCHITECTURE.md](./docs/ARCHITECTURE.md).
 
 ## Usage
 Example query:
@@ -45,7 +44,7 @@ An example config can be found in ./examples/config.toml
 <br>
 
 <sup>
-	This repository follows <a href="https://github.com/valeratrades/.github/tree/master/best_practices">my best practices</a> and <a href="https://github.com/tigerbeetle/tigerbeetle/blob/main/docs/TIGER_STYLE.md">Tiger Style</a> (except "proper capitalization for acronyms": (VsrState, not VSRState) and formatting).
+	This repository follows <a href="https://github.com/valeratrades/.github/tree/master/best_practices">my best practices</a> and <a href="https://github.com/tigerbeetle/tigerbeetle/blob/main/docs/TIGER_STYLE.md">Tiger Style</a> (except "proper capitalization for acronyms": (VsrState, not VSRState) and formatting). For project's architecture, see <a href="./docs/ARCHITECTURE.md">ARCHITECTURE.md</a>.
 </sup>
 
 #### License

README.md

@@ -1,8 +1,11 @@
-use std::process::Command;
-
 fn main() {
+	git_version();
+	log_directives();
+}
+
+fn git_version() {
 	// Embed git commit hash (fallback to "unknown" if git unavailable, e.g., in Nix sandbox)
-	let git_hash = Command::new("git")
+	let git_hash = std::process::Command::new("git")
 		.args(["rev-parse", "--short", "HEAD"])
 		.output()
 		.ok()
@@ -11,7 +14,9 @@ fn main() {
 		.map(|s| s.trim().to_string())
 		.unwrap_or_else(|| "unknown".to_string());
 	println!("cargo:rustc-env=GIT_HASH={git_hash}");
+}
 
+fn log_directives() {
 	// Embed log directives if .cargo/log_directives exists
 	println!("cargo:rerun-if-changed=.cargo/log_directives");
 	if let Ok(directives) = std::fs::read_to_string(".cargo/log_directives") {

discretionary_engine/build.rs

@@ -10,8 +10,7 @@ use crate::{protocols::interpret_protocol_specs, redis_bus};
 pub struct SubmitArgs {
 	pub size_usdt: f64,
 	pub coin: String,
-	pub acquisition_protocols: Vec<String>,
-	pub followup_protocols: Vec<String>,
+	pub protocols: Vec<String>,
 	pub testnet: bool,
 }
 
@@ -27,10 +26,7 @@ fn build_cli_string(args: &SubmitArgs) -> String {
 	parts.push(format!("-s {}", args.size_usdt));
 	parts.push(format!("-c {}", args.coin));
 
-	for proto in &args.acquisition_protocols {
-		parts.push(format!("-a {}", proto));
-	}
-	for proto in &args.followup_protocols {
+	for proto in &args.protocols {
 		parts.push(format!("-f {}", proto));
 	}
 
@@ -40,8 +36,7 @@ fn build_cli_string(args: &SubmitArgs) -> String {
 /// Submit a position request via Redis.
 pub async fn submit(args: SubmitArgs, redis_port: u16) -> Result<()> {
 	// Validate protocols first
-	let _acquisition_protocols = interpret_protocol_specs(args.acquisition_protocols.clone()).wrap_err("Invalid acquisition protocols")?;
-	let _followup_protocols = interpret_protocol_specs(args.followup_protocols.clone()).wrap_err("Invalid followup protocols")?;
+	let _protocols = interpret_protocol_specs(args.protocols.clone()).wrap_err("Invalid acquisition protocols")?;
 
 	// Build CLI string and publish to Redis
 	let cli_string = build_cli_string(&args);

discretionary_engine_strategy/src/commands.rs

@@ -1,5 +1,3 @@
-//! Strategy configuration.
-
 use v_utils::macros as v_macros;
 
 fn __default_redis_port() -> u16 {

discretionary_engine_strategy/src/config.rs

@@ -14,7 +14,7 @@ pub const CONSUMER_GROUP: &str = "strategy_consumers";
 
 /// Connect to Redis asynchronously.
 pub async fn connect(port: u16) -> Result<MultiplexedConnection> {
-	let url = format!("redis://127.0.0.1:{}/", port);
+	let url = format!("redis://127.0.0.1:{port}/");
 	let client = Client::open(url.as_str()).wrap_err("Failed to create Redis client")?;
 	let conn = client.get_multiplexed_async_connection().await.wrap_err("Failed to connect to Redis")?;
 	Ok(conn)
@@ -82,13 +82,13 @@ impl CommandSubscriber {
 				for stream_key in reply.keys {
 					for entry in stream_key.ids {
 						let id = entry.id.clone();
-						if let Some(cmd) = entry.map.get("cmd") {
-							if let redis::Value::BulkString(bytes) = cmd {
-								let cmd_str = String::from_utf8_lossy(bytes).to_string();
-								// Acknowledge the message
-								let _: () = self.conn.xack(STREAM_KEY, CONSUMER_GROUP, &[&id]).await?;
-								return Ok(Some((id, cmd_str)));
-							}
+						if let Some(cmd) = entry.map.get("cmd")
+							&& let redis::Value::BulkString(bytes) = cmd
+						{
+							let cmd_str = String::from_utf8_lossy(bytes).to_string();
+							// Acknowledge the message
+							let _: () = self.conn.xack(STREAM_KEY, CONSUMER_GROUP, &[&id]).await?;
+							return Ok(Some((id, cmd_str)));
 						}
 					}
 				}

discretionary_engine_strategy/src/redis_bus.rs

@@ -12,13 +12,12 @@ use crate::{
 	strategy::PrintTradesStrategy,
 };
 
-/// Start the strategy with Bybit data feed.
+/// Start the strategy with trade data feed.
 pub async fn start() -> Result<()> {
 	// Create channel for trades (the bridge between data layer and strategy)
 	let (trade_tx, trade_rx) = mpsc::unbounded_channel();
 
-	// Initialize exchange-specific data feed
-	// This is the ONLY place where we mention Bybit
+	// we ONLY talk about specifics in DataFeed initialization
 	let config = BybitDataConfig::default();
 	let data_handle = init_data(config, trade_tx).await?;
 

discretionary_engine_strategy/src/start.rs

@@ -4,7 +4,7 @@
     rust-overlay.url = "github:oxalica/rust-overlay";
     flake-utils.url = "github:numtide/flake-utils";
     pre-commit-hooks.url = "github:cachix/git-hooks.nix";
-    v-utils.url = "github:valeratrades/.github";
+    v-utils.url = "github:valeratrades/.github?ref=v1.4";
   };
 
   outputs = { self, nixpkgs, rust-overlay, flake-utils, pre-commit-hooks, v-utils, ... }: