From 3c2ce7647d894e192807ebea255ebb29466a3e80 Mon Sep 17 00:00:00 2001 From: Godmode Galactus Date: Thu, 15 Jun 2023 18:43:57 +0200 Subject: [PATCH] solving deadlock and pointing cargo to github repo --- Cargo.lock | 2 ++ Cargo.toml | 4 ++-- src/confirmation_strategies.rs | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d0f055..68187bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5777,6 +5777,7 @@ dependencies = [ [[package]] name = "solana-lite-rpc-core" version = "0.2.0" +source = "git+https://github.com/blockworks-foundation/lite-rpc.git?branch=mango_simulation_test#ddd9f95a4d23972a4a49ea4db0086030bb7d6a72" dependencies = [ "anyhow", "async-trait", @@ -5808,6 +5809,7 @@ dependencies = [ [[package]] name = "solana-lite-rpc-services" version = "0.2.0" +source = "git+https://github.com/blockworks-foundation/lite-rpc.git?branch=mango_simulation_test#ddd9f95a4d23972a4a49ea4db0086030bb7d6a72" dependencies = [ "anyhow", "async-channel", diff --git a/Cargo.toml b/Cargo.toml index be3a3ce..0e43014 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,8 +49,8 @@ solana-logger = "1.15.2" solana-transaction-status = "1.15.2" solana-account-decoder = "1.15.2" -solana-lite-rpc-core = { path = "/home/galactus/mangolana/lite-rpc/core" } -solana-lite-rpc-services = { path = "/home/galactus/mangolana/lite-rpc/services" } +solana-lite-rpc-core = { git = "https://github.com/blockworks-foundation/lite-rpc.git", branch = "mango_simulation_test" } +solana-lite-rpc-services = { git = "https://github.com/blockworks-foundation/lite-rpc.git", branch = "mango_simulation_test" } # pin program to mango-v3 version of solana sdk diff --git a/src/confirmation_strategies.rs b/src/confirmation_strategies.rs index d45b99f..e854156 100644 --- a/src/confirmation_strategies.rs +++ b/src/confirmation_strategies.rs @@ -170,6 +170,8 @@ pub fn confirmation_by_lite_rpc_notification_stream( tokio::spawn(async move { let mut tx_record_rx = tx_record_rx; let mut notification_stream = notification_stream; + + #[allow(unused_assignments)] let mut remove_tx = None; while !transaction_map.is_empty() || !exit_signal.load(Ordering::Relaxed) { tokio::select! {