Skip to content

bump stable rustc version to 1.65 #140

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

Merged
notmandatory merged 2 commits into from
Feb 14, 2023
Merged

bump stable rustc version to 1.65 #140

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
0f3aca2
bump stable rustc version to 1.65
rajarshimaitra Jan 18, 2023
e103664
Derive Eq on enums and struts where possible
rajarshimaitra Jan 18, 2023
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 .github/workflows/cont_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
matrix:
rust:
- 1.60.0 # STABLE
- 1.65.0 # STABLE
- 1.57.0 # MSRV
features:
- default
Expand Down
18 changes: 9 additions & 9 deletions src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ pub enum CliSubCommand {
}

/// Backend Node operation subcommands.
#[derive(Debug, Subcommand, Clone, PartialEq)]
#[derive(Debug, Subcommand, Clone, PartialEq, Eq)]
#[clap(rename_all = "lower")]
#[cfg(any(feature = "regtest-node"))]
pub enum NodeSubCommand {
Expand Down Expand Up @@ -179,7 +179,7 @@ pub enum WalletSubCommand {
}

/// Config options wallet operations can take.
#[derive(Debug, Parser, Clone, PartialEq)]
#[derive(Debug, Parser, Clone, PartialEq, Eq)]
pub struct WalletOpts {
/// Selects the wallet to use.
#[clap(name = "WALLET_NAME", short = 'w', long = "wallet")]
Expand Down Expand Up @@ -212,7 +212,7 @@ pub struct WalletOpts {

/// Options to configure a SOCKS5 proxy for a blockchain client connection.
#[cfg(any(feature = "compact_filters", feature = "electrum", feature = "esplora"))]
#[derive(Debug, Args, Clone, PartialEq)]
#[derive(Debug, Args, Clone, PartialEq, Eq)]
pub struct ProxyOpts {
/// Sets the SOCKS5 proxy for a blockchain client.
#[clap(name = "PROXY_ADDRS:PORT", long = "proxy", short = 'p')]
Expand All @@ -234,7 +234,7 @@ pub struct ProxyOpts {

/// Options to configure a BIP157 Compact Filter backend.
#[cfg(feature = "compact_filters")]
#[derive(Debug, Args, Clone, PartialEq)]
#[derive(Debug, Args, Clone, PartialEq, Eq)]
pub struct CompactFilterOpts {
/// Sets the full node network address.
#[clap(
Expand All @@ -261,7 +261,7 @@ pub struct CompactFilterOpts {

/// Options to configure a bitcoin core rpc backend.
#[cfg(feature = "rpc")]
#[derive(Debug, Args, Clone, PartialEq)]
#[derive(Debug, Args, Clone, PartialEq, Eq)]
pub struct RpcOpts {
/// Sets the full node address for rpc connection.
#[clap(
Expand Down Expand Up @@ -298,7 +298,7 @@ pub struct RpcOpts {

/// Options to configure electrum backend.
#[cfg(feature = "electrum")]
#[derive(Debug, Args, Clone, PartialEq)]
#[derive(Debug, Args, Clone, PartialEq, Eq)]
pub struct ElectrumOpts {
/// Sets the SOCKS5 proxy timeout for the Electrum client.
#[clap(name = "PROXY_TIMEOUT", short = 't', long = "timeout")]
Expand All @@ -324,7 +324,7 @@ pub struct ElectrumOpts {

/// Options to configure Esplora backend.
#[cfg(feature = "esplora")]
#[derive(Debug, Args, Clone, PartialEq)]
#[derive(Debug, Args, Clone, PartialEq, Eq)]
pub struct EsploraOpts {
/// Use the esplora server if given as parameter.
#[clap(
Expand Down Expand Up @@ -477,7 +477,7 @@ pub enum OfflineWalletSubCommand {
}

/// Wallet subcommands that needs a blockchain backend.
#[derive(Debug, Subcommand, Clone, PartialEq)]
#[derive(Debug, Subcommand, Clone, PartialEq, Eq)]
#[clap(rename_all = "snake")]
#[cfg(any(
feature = "electrum",
Expand Down Expand Up @@ -530,7 +530,7 @@ pub enum OnlineWalletSubCommand {
}

/// Subcommands for Key operations.
#[derive(Debug, Subcommand, Clone, PartialEq)]
#[derive(Debug, Subcommand, Clone, PartialEq, Eq)]
pub enum KeySubCommand {
/// Generates new random seed mnemonic phrase and corresponding master extended key.
Generate {
Expand Down
12 changes: 6 additions & 6 deletions src/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,18 +747,18 @@ pub(crate) fn handle_command(cli_opts: CliOpts) -> Result<String, Error> {
result.map_err(|e| e.into())
}

#[cfg(any(
feature = "electrum",
feature = "esplora",
feature = "compact_filters",
feature = "rpc"
))]
#[cfg(test)]
mod test {
use super::*;
use bdk::bitcoin::psbt::PartiallySignedTransaction;
use std::str::FromStr;

#[cfg(any(
feature = "electrum",
feature = "esplora",
feature = "compact_filters",
feature = "rpc"
))]
#[test]
fn test_psbt_is_final() {
let unsigned_psbt = PartiallySignedTransaction::from_str("cHNidP8BAIkBAAAAASWJHzxzyVORV/C3lAynKHVVL7+Rw7/Jj8U9fuvD24olAAAAAAD+////AiBOAAAAAAAAIgAgLzY9yE4jzTFJnHtTjkc+rFAtJ9NB7ENFQ1xLYoKsI1cfqgKVAAAAACIAIFsbWgDeLGU8EA+RGwBDIbcv4gaGG0tbEIhDvwXXa/E7LwEAAAABALUCAAAAAAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////BALLAAD/////AgD5ApUAAAAAIgAgWxtaAN4sZTwQD5EbAEMhty/iBoYbS1sQiEO/Bddr8TsAAAAAAAAAACZqJKohqe3i9hw/cdHe/T+pmd+jaVN1XGkGiXmZYrSL69g2l06M+QEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQErAPkClQAAAAAiACBbG1oA3ixlPBAPkRsAQyG3L+IGhhtLWxCIQ78F12vxOwEFR1IhA/JV2U/0pXW+iP49QcsYilEvkZEd4phmDM8nV8wC+MeDIQLKhV/gEZYmlsQXnsL5/Uqv5Y8O31tmWW1LQqIBkiqzCVKuIgYCyoVf4BGWJpbEF57C+f1Kr+WPDt9bZlltS0KiAZIqswkEboH3lCIGA/JV2U/0pXW+iP49QcsYilEvkZEd4phmDM8nV8wC+MeDBDS6ZSEAACICAsqFX+ARliaWxBeewvn9Sq/ljw7fW2ZZbUtCogGSKrMJBG6B95QiAgPyVdlP9KV1voj+PUHLGIpRL5GRHeKYZgzPJ1fMAvjHgwQ0umUhAA==").unwrap();
Expand Down