Skip to content

core: fixing the esplora error match #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vincenzopalazzo wants to merge 2 commits into from
Closed

core: fixing the esplora error match #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eee955
core: fixing the esplora error match
vincenzopalazzo Dec 3, 2024
93d2f44
fixup! core: fixing the esplora error match
vincenzopalazzo Dec 3, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ base64 = { version = "0.22.1", default-features = false, features = ["std"] }
rand = "0.8.5"
chrono = { version = "0.4", default-features = false, features = ["clock"] }
tokio = { version = "1.37", default-features = false, features = [ "rt-multi-thread", "time", "sync", "macros" ] }
esplora-client = { version = "0.9", default-features = false }
esplora-client = { version = "0.10", default-features = false }
Copy link
Collaborator

@tnull tnull Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't just arbitrarily bump crates. Bumping should always happen in dedicated commits at least and only if we see necessity to do so. In this specific case, our esplora-client version needs to match the one in lightning-transaction-sync, so we can only bump it as part of the next LDK upgrade (after LDK is upgraded, that is).

Copy link
Contributor Author

@vincenzopalazzo vincenzopalazzo Dec 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it. It was just a test, but github is stuck for some reason the update branch is https://github.com/vincenzopalazzo/ldk-node/tree/macros/esplora-api

libc = "0.2"
uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
Expand Down
10 changes: 5 additions & 5 deletions src/chain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,8 +991,8 @@ impl ChainSource {
);
},
Err(e) => match e {
esplora_client::Error::Reqwest(err) => {
if err.status() == reqwest::StatusCode::from_u16(400).ok() {
esplora_client::Error::HttpResponse { status, message } => {
if status == 400 {
// Log 400 at lesser level, as this often just means bitcoind already knows the
// transaction.
// FIXME: We can further differentiate here based on the error
Expand All @@ -1001,13 +1001,13 @@ impl ChainSource {
log_trace!(
logger,
"Failed to broadcast due to HTTP connection error: {}",
err
message
);
} else {
log_error!(
logger,
"Failed to broadcast due to HTTP connection error: {}",
err
"Failed to broadcast due to HTTP connection error: {} - {}",
status, message
);
}
log_trace!(
Expand Down
Loading