Skip to content

Commit f1bab08

Browse files
committed
Merge #241: chore: remove remainig MSRV mentions
4347ea2 chore: clippy fixes (Vadim Anufriev) 09b5b3b chore: remove remainig msrv mentions (Vadim Anufriev) Pull request description: Relates #211. ### Description I noticed that we still have mentions of MSRV, despite the fact that MSRV was removed in #211. In this PR I'm removing the found mentions. ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: tvpeter: ACK 4347ea2 notmandatory: ACK 4347ea2 Tree-SHA512: 6a3d8efcf7e70ebf5b5dce2e49eba5af41ef6cb22052db78dd3b00e77052b746285d55cd8b571a914f7d3e0b926382be220fe8a0a1d225366c6075a38cf752fa
2 parents 61f850b + 4347ea2 commit f1bab08

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

Justfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set quiet := true
2-
msrv := "1.75.0"
32
default_wallet := 'regtest_default_wallet'
43
default_datadir := "$HOME/.bdk-bitcoin"
54
rpc_user := 'user'
@@ -42,10 +41,6 @@ clean:
4241
stable: clean
4342
rustup override set stable; cargo update
4443

45-
# set the rust version to the msrv and pin dependencies
46-
msrv: clean
47-
rustup override set {{msrv}}; cargo update; ./ci/pin-msrv.sh
48-
4944
# start regtest bitcoind in default data directory
5045
[group('rpc')]
5146
start:

clippy.toml

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/handlers.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,10 @@ pub fn handle_offline_wallet_subcommand(
364364
tx_builder.include_output_redeem_witness_script();
365365
}
366366

367-
if let Some(fee_rate) = fee_rate {
368-
if let Some(fee_rate) = FeeRate::from_sat_per_vb(fee_rate as u64) {
369-
tx_builder.fee_rate(fee_rate);
370-
}
367+
if let Some(fee_rate) = fee_rate
368+
&& let Some(fee_rate) = FeeRate::from_sat_per_vb(fee_rate as u64)
369+
{
370+
tx_builder.fee_rate(fee_rate);
371371
}
372372

373373
if let Some(utxos) = utxos {
@@ -770,14 +770,14 @@ pub fn handle_config_subcommand(
770770
);
771771
}
772772

773-
if let Some(ref internal_desc) = int_descriptor {
774-
if internal_desc.contains("xprv") || internal_desc.contains("tprv") {
775-
eprintln!(
776-
"WARNING: Your internal descriptor contains PRIVATE KEYS.
773+
if let Some(ref internal_desc) = int_descriptor
774+
&& (internal_desc.contains("xprv") || internal_desc.contains("tprv"))
775+
{
776+
eprintln!(
777+
"WARNING: Your internal descriptor contains PRIVATE KEYS.
777778
Private keys will be saved in PLAINTEXT in the config file.
778779
This is a security risk. Consider using public descriptors instead.\n"
779-
);
780-
}
780+
);
781781
}
782782

783783
let mut config = WalletConfig::load(datadir)?.unwrap_or(WalletConfig {

0 commit comments

Comments
 (0)