From a1c9f27b02d1d1c4b1d8c3e46f84880fc6125972 Mon Sep 17 00:00:00 2001 From: Anatolii Kurotych Date: Mon, 11 Nov 2024 19:40:55 +0200 Subject: [PATCH] Use link to sqlx repo instead of fork (#893) --- Cargo.lock | 9 ++++----- Cargo.toml | 4 +++- boost_manager/Cargo.toml | 5 ----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74c492ed7..74087a040 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1788,7 +1788,6 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-crypto", "helium-proto", "http 0.2.11", "http-serde", @@ -8593,7 +8592,7 @@ dependencies = [ [[package]] name = "sqlx" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "sqlx-core", "sqlx-macros", @@ -8602,7 +8601,7 @@ dependencies = [ [[package]] name = "sqlx-core" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "ahash 0.7.6", "atoi", @@ -8658,7 +8657,7 @@ dependencies = [ [[package]] name = "sqlx-macros" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "dotenvy", "either", @@ -8676,7 +8675,7 @@ dependencies = [ [[package]] name = "sqlx-rt" version = "0.6.2" -source = "git+https://github.com/helium/sqlx.git?rev=92a2268f02e0cac6fccb34d3e926347071dbb88d#92a2268f02e0cac6fccb34d3e926347071dbb88d" +source = "git+https://github.com/launchbadge/sqlx.git?rev=42dd78fe931df651eac411316ed3eab87c2f79b2#42dd78fe931df651eac411316ed3eab87c2f79b2" dependencies = [ "once_cell", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 9860df9a0..7388ff0ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,7 +122,9 @@ tower-http = { version = "0", features = ["trace"] } derive_builder = "0" [patch.crates-io] -sqlx = { git = "https://github.com/helium/sqlx.git", rev = "92a2268f02e0cac6fccb34d3e926347071dbb88d" } +# v0.7.0-alpha.3 +# https://github.com/launchbadge/sqlx/commit/42dd78fe931df651eac411316ed3eab87c2f79b2 +sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df651eac411316ed3eab87c2f79b2" } # When attempting to test proto changes without needing to push a branch you can # patch the github url to point to your local proto repo. diff --git a/boost_manager/Cargo.toml b/boost_manager/Cargo.toml index 1a3115a70..07ca4029d 100644 --- a/boost_manager/Cargo.toml +++ b/boost_manager/Cargo.toml @@ -37,11 +37,6 @@ chrono = { workspace = true, features = ["serde"] } metrics = { workspace = true } metrics-exporter-prometheus = { workspace = true } helium-proto = { workspace = true } -helium-crypto = { workspace = true, features = [ - "sqlx-postgres", - "multisig", - "solana", -] } rust_decimal = { workspace = true } rust_decimal_macros = { workspace = true } tonic = { workspace = true }