Skip to content

fix(wallet): allow PersistedWallet to be Send + Sync #1874

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
merged 1 commit into from
Mar 11, 2025
Merged

fix(wallet): allow PersistedWallet to be Send + Sync #1874

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
10 changes: 5 additions & 5 deletions crates/wallet/src/wallet/persisted.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ pub trait AsyncWalletPersister {
#[derive(Debug)]
pub struct PersistedWallet<P> {
inner: Wallet,
marker: PhantomData<P>,
_marker: PhantomData<fn(&mut P)>,
}

impl<P> Deref for PersistedWallet<P> {
Expand Down Expand Up @@ -155,7 +155,7 @@ impl<P: WalletPersister> PersistedWallet<P> {
}
Ok(Self {
inner,
marker: PhantomData,
_marker: PhantomData,
})
}

Expand All @@ -169,7 +169,7 @@ impl<P: WalletPersister> PersistedWallet<P> {
.map(|opt| {
opt.map(|inner| PersistedWallet {
inner,
marker: PhantomData,
_marker: PhantomData,
})
})
.map_err(LoadWithPersistError::InvalidChangeSet)
Expand Down Expand Up @@ -214,7 +214,7 @@ impl<P: AsyncWalletPersister> PersistedWallet<P> {
}
Ok(Self {
inner,
marker: PhantomData,
_marker: PhantomData,
})
}

Expand All @@ -230,7 +230,7 @@ impl<P: AsyncWalletPersister> PersistedWallet<P> {
.map(|opt| {
opt.map(|inner| PersistedWallet {
inner,
marker: PhantomData,
_marker: PhantomData,
})
})
.map_err(LoadWithPersistError::InvalidChangeSet)
Expand Down
5 changes: 4 additions & 1 deletion crates/wallet/tests/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ use bdk_wallet::psbt::PsbtUtils;
use bdk_wallet::signer::{SignOptions, SignerError};
use bdk_wallet::test_utils::*;
use bdk_wallet::tx_builder::AddForeignUtxoError;
use bdk_wallet::{AddressInfo, Balance, ChangeSet, Update, Wallet, WalletPersister, WalletTx};
use bdk_wallet::{
AddressInfo, Balance, ChangeSet, PersistedWallet, Update, Wallet, WalletPersister, WalletTx,
};
use bdk_wallet::{KeychainKind, LoadError, LoadMismatch, LoadWithPersistError};
use bitcoin::constants::{ChainHash, COINBASE_MATURITY};
use bitcoin::hashes::Hash;
Expand Down Expand Up @@ -4209,6 +4211,7 @@ fn test_tx_cancellation() {
fn test_thread_safety() {
fn thread_safe<T: Send + Sync>() {}
thread_safe::<Wallet>(); // compiles only if true
thread_safe::<PersistedWallet<bdk_chain::rusqlite::Connection>>();
}

#[test]
Expand Down
Loading