Skip to content
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

Jump to bottom

Remove "use-miniscript" feature #85

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Remove "use-miniscript" feature #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ jobs:
matrix:
rust:
- version: 1.66.1 # STABLE
features: use-miniscript
features: miniscript
- version: 1.48.0 # MSRV
features: use-miniscript
features: miniscript
emulator:
- name: trezor
- name: ledger
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ readme = "README.md"

[dependencies]
bitcoin = { version = "0.29.1", features = ["serde", "base64"] }
miniscript = { version = "9.0", features = ["serde"], optional = true }
serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
pyo3 = { version = "0.15.1", features = ["auto-initialize"] }
base64 = "0.13.0"

miniscript = { version = "9.0", features = ["serde"], optional = true }

[dev-dependencies]
serial_test = "0.6.0"

[features]
doctest = []
use-miniscript = ["miniscript"]
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ mod tests {
use bitcoin::{secp256k1, Transaction};
use bitcoin::{TxIn, TxOut};

#[cfg(feature = "use-miniscript")]
#[cfg(feature = "miniscript")]
use miniscript::{Descriptor, DescriptorPublicKey};

#[test]
Expand Down Expand Up @@ -132,7 +132,7 @@ mod tests {

#[test]
#[serial]
#[cfg(feature = "use-miniscript")]
#[cfg(feature = "miniscript")]
fn test_get_miniscript_descriptors() {
let client = get_first_device();
let account = Some(10);
Expand All @@ -145,7 +145,7 @@ mod tests {

#[test]
#[serial]
#[cfg(feature = "use-miniscript")]
#[cfg(feature = "miniscript")]
fn test_display_address_with_miniscript_desc() {
let client = get_first_device();
let descriptor = client
Expand Down
4 changes: 2 additions & 2 deletions src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use pyo3::types::PyModule;
use pyo3::{IntoPy, PyObject};
use serde::{Deserialize, Deserializer};

#[cfg(feature = "use-miniscript")]
#[cfg(feature = "miniscript")]
use miniscript::{Descriptor, DescriptorPublicKey};

use crate::error::{Error, ErrorCode};
Expand Down Expand Up @@ -77,7 +77,7 @@ impl Deref for HWIPartiallySignedTransaction {

pub trait ToDescriptor {}
impl ToDescriptor for String {}
#[cfg(feature = "use-miniscript")]
#[cfg(feature = "miniscript")]
impl ToDescriptor for Descriptor<DescriptorPublicKey> {}

#[derive(Clone, Eq, PartialEq, Debug, Deserialize)]
Expand Down