Skip to content

Commit b06ba92

Browse files
committed
Use explicit Send/Sync rather than MaybeSend/MaybeSync
We use `MaybeSend` + `MaybeSync` in rust to only enable `Send`+`Sync` bounds if built with `std`, but there's no reason to bother with this in bindings, even for `no_std` builds. As the bindings generator doesn't currently have logic to identify traits like these as "synonyms" for `Send`+`Sync`, we just use `Send`+`Sync` explicitly.
1 parent f90f299 commit b06ba92

File tree

1 file changed

+10
-10
lines changed
  • lightning/src/events/bump_transaction

1 file changed

+10
-10
lines changed

lightning/src/events/bump_transaction/sync.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::chain::chaininterface::BroadcasterInterface;
1717
use crate::chain::ClaimId;
1818
use crate::prelude::*;
1919
use crate::sign::SignerProvider;
20-
use crate::util::async_poll::{dummy_waker, AsyncResult, MaybeSend, MaybeSync};
20+
use crate::util::async_poll::{dummy_waker, AsyncResult};
2121
use crate::util::logger::Logger;
2222

2323
use bitcoin::{Psbt, ScriptBuf, Transaction, TxOut};
@@ -93,30 +93,30 @@ where
9393
///
9494
/// For an asynchronous version of this wrapper, see [`Wallet`].
9595
// Note that updates to documentation on this struct should be copied to the asynchronous version.
96-
pub struct WalletSync<W: Deref + MaybeSync + MaybeSend, L: Deref + MaybeSync + MaybeSend>
96+
pub struct WalletSync<W: Deref + Sync + Send, L: Deref + Sync + Send>
9797
where
98-
W::Target: WalletSourceSync + MaybeSend,
99-
L::Target: Logger + MaybeSend,
98+
W::Target: WalletSourceSync + Send,
99+
L::Target: Logger + Send,
100100
{
101101
wallet: Wallet<WalletSourceSyncWrapper<W>, L>,
102102
}
103103

104-
impl<W: Deref + MaybeSync + MaybeSend, L: Deref + MaybeSync + MaybeSend> WalletSync<W, L>
104+
impl<W: Deref + Sync + Send, L: Deref + Sync + Send> WalletSync<W, L>
105105
where
106-
W::Target: WalletSourceSync + MaybeSend,
107-
L::Target: Logger + MaybeSend,
106+
W::Target: WalletSourceSync + Send,
107+
L::Target: Logger + Send,
108108
{
109109
/// Constructs a new [`WalletSync`] instance.
110110
pub fn new(source: W, logger: L) -> Self {
111111
Self { wallet: Wallet::new(WalletSourceSyncWrapper(source), logger) }
112112
}
113113
}
114114

115-
impl<W: Deref + MaybeSync + MaybeSend, L: Deref + MaybeSync + MaybeSend> CoinSelectionSourceSync
115+
impl<W: Deref + Sync + Send, L: Deref + Sync + Send> CoinSelectionSourceSync
116116
for WalletSync<W, L>
117117
where
118-
W::Target: WalletSourceSync + MaybeSend + MaybeSync,
119-
L::Target: Logger + MaybeSend + MaybeSync,
118+
W::Target: WalletSourceSync + Send + Sync,
119+
L::Target: Logger + Send + Sync,
120120
{
121121
fn select_confirmed_utxos(
122122
&self, claim_id: ClaimId, must_spend: Vec<Input>, must_pay_to: &[TxOut],

0 commit comments

Comments
 (0)