Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.2.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
bitreq = { version = "0.2", default-features = false, features = ["async-https"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.7"
Expand Down
17 changes: 6 additions & 11 deletions src/gossip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl GossipSource {

let response = tokio::time::timeout(
Duration::from_secs(RGS_SYNC_TIMEOUT_SECS),
reqwest::get(query_url),
bitreq::get(query_url).send_async(),
)
.await
.map_err(|e| {
Expand All @@ -104,15 +104,10 @@ impl GossipSource {
Error::GossipUpdateFailed
})?;

match response.error_for_status() {
Ok(res) => {
let update_data = res.bytes().await.map_err(|e| {
log_trace!(logger, "Failed to retrieve RGS gossip update: {}", e);
Error::GossipUpdateFailed
})?;

match response.status_code {
200 => {
let new_latest_sync_timestamp =
gossip_sync.update_network_graph(&update_data).map_err(|e| {
gossip_sync.update_network_graph(response.as_bytes()).map_err(|e| {
log_trace!(
logger,
"Failed to update network graph with RGS data: {:?}",
Expand All @@ -123,8 +118,8 @@ impl GossipSource {
latest_sync_timestamp.store(new_latest_sync_timestamp, Ordering::Release);
Ok(new_latest_sync_timestamp)
},
Err(e) => {
log_trace!(logger, "Failed to retrieve RGS gossip update: {}", e);
code => {
log_trace!(logger, "Failed to retrieve RGS gossip update: HTTP {}", code);
Err(Error::GossipUpdateFailed)
},
}
Expand Down
15 changes: 6 additions & 9 deletions src/scoring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ async fn sync_external_scores(
) -> () {
let response = tokio::time::timeout(
Duration::from_secs(EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS),
reqwest::get(url),
bitreq::get(url).send_async(),
)
.await;

Expand All @@ -74,14 +74,11 @@ async fn sync_external_scores(
return;
},
};
let body = match response.bytes().await {
Ok(bytes) => bytes,
Err(e) => {
log_error!(logger, "Failed to read external scores update: {}", e);
return;
},
};
let mut reader = Cursor::new(body);
if response.status_code != 200 {
log_trace!(logger, "Failed to retrieve external scores update: HTTP {}", response.status_code);
return;
}
let mut reader = Cursor::new(response.as_bytes());
match ChannelLiquidities::read(&mut reader) {
Ok(liquidities) => {
if let Err(e) = write_external_pathfinding_scores_to_cache(
Expand Down
Loading