Skip to content

Commit 0562061

Browse files
committed
Merge #405: revert: "chore: deprecate wallet::signer mod"
77964fb Revert "chore: deprecate `wallet::signer` mod" (Steve Myers) a604d94 fix(ci): pin `clap` to `4.5.17` (Leonardo Lima) Pull request description: ### Description This reverts commit 4c4e0b1. Will deprecate the signer mod again when the new psbt signer is ready. ### Notes to the reviewers The signer mod is not deprecated in `master` branch and won't be until the psbt signer is ready, likely in the 3.1 release. ### Changelog notice - Un-deprecate the existing bdk_wallet signer mod due to unfinished work on the new psbt signer. ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `just p` before pushing ACKs for top commit: oleonardolima: ACK 77964fb Tree-SHA512: 716040140621b14c69eb81cd302cea98d92d0461b71e482895a646b988ac7560bca0f30787dbf09d19cf702b44a9173496ea574ad640c686d7588195e33f304c
2 parents 7f22aa7 + 77964fb commit 0562061

12 files changed

Lines changed: 1 addition & 14 deletions

File tree

ci/pin-msrv.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ set -euo pipefail
1010
# cargo clean
1111
# rustup override set 1.63.0
1212

13+
cargo update -p clap --precise "4.5.17"
1314
cargo update -p once_cell --precise "1.20.3"
1415
cargo update -p syn --precise "2.0.106"
1516
cargo update -p quote --precise "1.0.41"

examples/example_wallet_electrum/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use bdk_electrum::electrum_client;
32
use bdk_electrum::BdkElectrumClient;
43
use bdk_wallet::bitcoin::Amount;

examples/example_wallet_esplora_async/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use anyhow::Ok;
32
use bdk_esplora::{esplora_client, EsploraAsyncExt};
43
use bdk_wallet::{

examples/example_wallet_esplora_blocking/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use bdk_esplora::{esplora_client, EsploraExt};
32
use bdk_wallet::rusqlite::Connection;
43
use bdk_wallet::{

wallet/examples/policy.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// You may not use this file except in accordance with one or both of these
1010
// licenses.
1111

12-
#![allow(deprecated)]
1312
extern crate bdk_wallet;
1413
use std::error::Error;
1514

wallet/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
doc(html_logo_url = "https://github.com/bitcoindevkit/bdk/raw/master/static/bdk.png")
77
)]
88
#![no_std]
9-
#![allow(deprecated)] // Signers are being removed.
109
#![warn(missing_docs)]
1110
#![allow(clippy::uninlined_format_args)]
1211

wallet/src/wallet/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ pub mod export;
5757
pub mod migration;
5858
mod params;
5959
mod persisted;
60-
#[deprecated(
61-
since = "2.2.0",
62-
note = "PSBT signing was moved to `bitcoin::psbt` module"
63-
)]
6460
pub mod signer;
6561
pub mod tx_builder;
6662
pub(crate) mod utils;

wallet/tests/add_foreign_utxo.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use std::str::FromStr;
32

43
use bdk_wallet::psbt::PsbtUtils;

wallet/tests/persisted_wallet.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use std::collections::{BTreeMap, BTreeSet};
32
use std::path::Path;
43

wallet/tests/psbt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![allow(deprecated)]
21
use bdk_wallet::bitcoin::{Amount, FeeRate, Psbt, TxIn};
32
use bdk_wallet::test_utils::*;
43
use bdk_wallet::{psbt, KeychainKind, SignOptions};

0 commit comments

Comments
 (0)