Compare commits

..

6 Commits

Author SHA1 Message Date
Steve Myers
785371e0a1
Merge bitcoindevkit/bdk#1530: chore: fix clippy lints
Some checks failed
Code Coverage / Code Coverage (push) Failing after 1m1s
CI / Build and test (--all-features, map[clippy:true version:stable]) (push) Failing after 7m39s
CI / Build and test (--all-features, map[version:1.63.0]) (push) Failing after 18m9s
CI / Build and test (--no-default-features, map[clippy:true version:stable]) (push) Failing after 8m41s
CI / Build and test (--no-default-features, map[version:1.63.0]) (push) Failing after 16m42s
CI / Check no_std (push) Successful in 1m37s
CI / Check WASM (push) Successful in 3m15s
CI / Rust fmt (push) Successful in 21s
CI / clippy_check (push) Failing after 16s
Publish Nightly Docs / Build docs (push) Failing after 7s
Publish Nightly Docs / Publish docs (push) Has been skipped
8bf8c7d080194872188e1ab7a6f14c06b121e371 chore: fix clippy lints (Jose Storopoli)

Pull request description:

  ### Description

  Fix some clippy CI lints

  ### Notes to the reviewers

  More caught by the Nix CI in #1320.

  ### Changelog notice

  chore: clippy lints

  ### 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 `cargo fmt` and `cargo clippy` before committing

  #### New Features:

  * [ ] I've added tests for the new feature
  * [ ] I've added docs for the new feature

  #### Bugfixes:

  * [ ] This pull request breaks the existing API
  * [ ] I've added tests to reproduce the issue which are now passing
  * [ ] I'm linking the issue being fixed by this PR

ACKs for top commit:
  notmandatory:
    ACK 8bf8c7d080194872188e1ab7a6f14c06b121e371

Tree-SHA512: 6b53cb739e506d79106a2f42aa2b8fa28ef226543fbbf100225f10ed82257f6fd0218f09c0f1291803fbc9c1c88e32ba1c7e02fe3f601ccc9dc5be8a6efea6e1
2024-07-31 23:11:38 -05:00
Steve Myers
18626c66ac
Merge bitcoindevkit/bdk#1529: fix: typos
a8efeaa0fb83848a04e7324311ccaca4e2c4ab71 fix: typos (Jose Storopoli)

Pull request description:

  ### Description

  Needed for the typos nix check in #1320.

  ### Notes to the reviewers

  More typos that the Nix CI caught.

  ### Changelog notice

  - fix: typos

  ### 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 `cargo fmt` and `cargo clippy` before committing

  #### New Features:

  * [ ] I've added tests for the new feature
  * [ ] I've added docs for the new feature

  #### Bugfixes:

  * [ ] This pull request breaks the existing API
  * [ ] I've added tests to reproduce the issue which are now passing
  * [ ] I'm linking the issue being fixed by this PR

ACKs for top commit:
  notmandatory:
    ACK a8efeaa0fb83848a04e7324311ccaca4e2c4ab71

Tree-SHA512: 44a625bcf538acb7a766316f1d512ef3fd7cc14aae03f09b129229946ef156be35dff73dab3dc24fbc21137764b5707a2bd632bfb84b38dc9fe4d061659ac766
2024-07-31 22:55:15 -05:00
Jose Storopoli
8bf8c7d080
chore: fix clippy lints 2024-07-30 14:43:32 -03:00
Jose Storopoli
a8efeaa0fb
fix: typos
Needed for the typos nix check in #1320.
2024-07-30 13:35:23 -03:00
Steve Myers
82141a8201
Merge bitcoindevkit/bdk#1524: ci: pin tokio to 1.38.1 to support MSRV 1.63
28d75304e1319f49ab72c582f03a916ee40463dd ci: pin tokio to 1.38.1 to support MSRV 1.63 (Steve Myers)

Pull request description:

  ### Description

  The latest tokio minor version update from 1.38.1 to 1.39.1 changed it's MSRV from 1.63.0 to 1.70.0, breaking our CI MSRV 1.63 testing. This PR pins `tokio` back to 1.38.1 for our CI MSRV testing.

  ### Notes to the reviewers

  https://github.com/tokio-rs/tokio/pull/6645

  https://crates.io/crates/tokio/versions

  ### 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 `cargo fmt` and `cargo clippy` before committing

ACKs for top commit:
  LagginTimes:
    ACK 28d75304e1319f49ab72c582f03a916ee40463dd
  ValuedMammal:
    ACK 28d75304e1319f49ab72c582f03a916ee40463dd
  oleonardolima:
    ACK 28d75304e1319f49ab72c582f03a916ee40463dd

Tree-SHA512: 9eef750422cb8c3faa15771438e790afae44362d7c77e1d36cf70816ac7dabdd2e408e14502836ec86f845a2f1fe82905000c681fb6b4e873b036a41a280abd9
2024-07-27 08:17:37 -05:00
Steve Myers
28d75304e1
ci: pin tokio to 1.38.1 to support MSRV 1.63 2024-07-25 22:16:25 -05:00
8 changed files with 7 additions and 6 deletions

View File

@ -36,6 +36,7 @@ jobs:
cargo update -p proptest --precise "1.2.0" cargo update -p proptest --precise "1.2.0"
cargo update -p url --precise "2.5.0" cargo update -p url --precise "2.5.0"
cargo update -p cc --precise "1.0.105" cargo update -p cc --precise "1.0.105"
cargo update -p tokio --precise "1.38.1"
- name: Build - name: Build
run: cargo build ${{ matrix.features }} run: cargo build ${{ matrix.features }}
- name: Test - name: Test

View File

@ -74,6 +74,7 @@ cargo update -p home --precise "0.5.5"
cargo update -p proptest --precise "1.2.0" cargo update -p proptest --precise "1.2.0"
cargo update -p url --precise "2.5.0" cargo update -p url --precise "2.5.0"
cargo update -p cc --precise "1.0.105" cargo update -p cc --precise "1.0.105"
cargo update -p tokio --precise "1.38.1"
``` ```
## License ## License

View File

@ -107,7 +107,7 @@ impl<T> Persisted<T> {
Ok(T::load(db, params)?.map(|inner| Self { inner })) Ok(T::load(db, params)?.map(|inner| Self { inner }))
} }
/// Contruct a persisted `T` from an async `Db`. /// Construct a persisted `T` from an async `Db`.
pub async fn load_async<Db>( pub async fn load_async<Db>(
db: &mut Db, db: &mut Db,
params: T::LoadParams, params: T::LoadParams,

View File

@ -93,7 +93,6 @@ impl ChangeSet {
Self::init_wallet_sqlite_tables(db_tx)?; Self::init_wallet_sqlite_tables(db_tx)?;
use chain::rusqlite::OptionalExtension; use chain::rusqlite::OptionalExtension;
use chain::Impl; use chain::Impl;
use miniscript::{Descriptor, DescriptorPublicKey};
let mut changeset = Self::default(); let mut changeset = Self::default();

View File

@ -150,7 +150,7 @@ impl LoadParams {
} }
/// Checks that `descriptor` of `keychain` matches this, and extracts private keys (if /// Checks that `descriptor` of `keychain` matches this, and extracts private keys (if
/// avaliable). /// available).
pub fn descriptors<D>(mut self, descriptor: D, change_descriptor: D) -> Self pub fn descriptors<D>(mut self, descriptor: D, change_descriptor: D) -> Self
where where
D: IntoWalletDescriptor + 'static, D: IntoWalletDescriptor + 'static,

View File

@ -154,7 +154,7 @@ impl<E: fmt::Debug + fmt::Display> std::error::Error for LoadWithPersistError<E>
pub enum CreateWithPersistError<E> { pub enum CreateWithPersistError<E> {
/// Error from persistence. /// Error from persistence.
Persist(E), Persist(E),
/// Occurs when the loaded changeset cannot contruct [`Wallet`]. /// Occurs when the loaded changeset cannot construct [`Wallet`].
Descriptor(DescriptorError), Descriptor(DescriptorError),
} }