Compare commits

..

No commits in common. "frost" and "v1.0.0-beta.1" have entirely different histories.

8 changed files with 6 additions and 7 deletions

View File

@ -36,7 +36,6 @@ 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,7 +74,6 @@ 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 }))
} }
/// Construct a persisted `T` from an async `Db`. /// Contruct 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,6 +93,7 @@ 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
/// available). /// avaliable).
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 construct [`Wallet`]. /// Occurs when the loaded changeset cannot contruct [`Wallet`].
Descriptor(DescriptorError), Descriptor(DescriptorError),
} }