Skip to content

Commit 097fc2f

Browse files
committed
fix: remove unnecessary MSRV workarounds
1 parent c430adf commit 097fc2f

File tree

4 files changed

+8
-58
lines changed

4 files changed

+8
-58
lines changed

.github/workflows/cont_integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ jobs:
6464
MATRIX_RUST_VERSION: ${{ matrix.rust.version }}
6565
run: |
6666
if [ $MATRIX_RUST_VERSION = '1.63.0' ]; then
67-
cargo build --workspace --exclude 'example_*' --exclude 'bdk_electrum' ${{ matrix.features }}
68-
cargo test --workspace --exclude 'example_*' --exclude 'bdk_electrum' ${{ matrix.features }}
67+
cargo build --workspace --exclude 'bdk_electrum' ${{ matrix.features }}
68+
cargo test --workspace --exclude 'bdk_electrum' ${{ matrix.features }}
6969
else
70-
cargo build --workspace --exclude 'example_*' ${{ matrix.features }}
71-
cargo test --workspace --exclude 'example_*' ${{ matrix.features }}
70+
cargo build --workspace ${{ matrix.features }}
71+
cargo test --workspace ${{ matrix.features }}
7272
fi
7373
7474
check-no-std:

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ members = [
1313
[workspace.package]
1414
authors = ["Bitcoin Dev Kit Developers"]
1515

16-
[workspace.dependencies]
17-
tokio = "=1.38.1"
18-
reqwest = "=0.12.4"
19-
socket2 = "=0.5.10"
20-
2116
[workspace.lints.clippy]
2217
print_stdout = "deny"
2318
print_stderr = "deny"

crates/electrum/src/bdk_electrum_client.rs

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,7 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
3030
/// Creates a new bdk client from a [`electrum_client::ElectrumApi`]
3131
///
3232
/// # Example
33-
#[cfg_attr(
34-
not(any(
35-
feature = "use-rustls",
36-
feature = "use-rustls-ring",
37-
feature = "use-openssl"
38-
)),
39-
doc = "```ignore"
40-
)]
41-
#[cfg_attr(
42-
any(
43-
feature = "use-rustls",
44-
feature = "use-rustls-ring",
45-
feature = "use-openssl"
46-
),
47-
doc = "```no_run"
48-
)]
33+
/// ```no_run
4934
/// use bdk_electrum::{electrum_client, BdkElectrumClient};
5035
///
5136
/// let client = electrum_client::Client::new("ssl://electrum.blockstream.info:50002")?;
@@ -115,22 +100,7 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
115100
/// transaction graph.
116101
///
117102
/// # Example
118-
#[cfg_attr(
119-
not(any(
120-
feature = "use-rustls",
121-
feature = "use-rustls-ring",
122-
feature = "use-openssl"
123-
)),
124-
doc = "```ignore"
125-
)]
126-
#[cfg_attr(
127-
any(
128-
feature = "use-rustls",
129-
feature = "use-rustls-ring",
130-
feature = "use-openssl"
131-
),
132-
doc = "```no_run"
133-
)]
103+
/// ```no_run
134104
/// use bdk_core::{spk_client::FullScanRequest, BlockId, CheckPoint};
135105
/// use bdk_electrum::BdkElectrumClient;
136106
/// # use bdk_electrum::electrum_client;
@@ -233,22 +203,7 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
233203
/// may include scripts that have been used, use [`full_scan`] with the keychain.
234204
///
235205
/// # Example
236-
#[cfg_attr(
237-
not(any(
238-
feature = "use-rustls",
239-
feature = "use-rustls-ring",
240-
feature = "use-openssl"
241-
)),
242-
doc = "```ignore"
243-
)]
244-
#[cfg_attr(
245-
any(
246-
feature = "use-rustls",
247-
feature = "use-rustls-ring",
248-
feature = "use-openssl"
249-
),
250-
doc = "```no_run"
251-
)]
206+
/// ```no_run
252207
/// use bdk_core::bitcoin::ScriptBuf;
253208
/// use bdk_core::spk_client::SyncRequest;
254209
/// use bdk_electrum::BdkElectrumClient;

crates/esplora/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ futures = { version = "0.3.26", optional = true }
2424
esplora-client = { version = "0.12.0" }
2525
bdk_chain = { path = "../chain" }
2626
bdk_testenv = { path = "../testenv" }
27-
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] }
27+
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] }
2828

2929
[features]
3030
default = ["std", "async-https", "blocking-https"]

0 commit comments

Comments
 (0)