Consolidate all the pub aync utils to native_async

Author: TheBlueMatt

lightning-background-processor/src/lib.rs

@@ -53,8 +53,6 @@ use lightning::routing::utxo::UtxoLookup;
 use lightning::sign::{
 	ChangeDestinationSource, ChangeDestinationSourceSync, EntropySource, OutputSpender,
 };
-#[cfg(not(c_bindings))]
-use lightning::util::async_poll::MaybeSend;
 use lightning::util::logger::Logger;
 use lightning::util::persist::{
 	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
@@ -63,6 +61,8 @@ use lightning::util::persist::{
 	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
 	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
+#[cfg(not(c_bindings))]
+use lightning::util::native_async::MaybeSend;
 use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
 use lightning::util::wakers::Future;
 #[cfg(feature = "std")]

lightning/src/chain/chainmonitor.rs

@@ -51,10 +51,9 @@ use crate::sign::ecdsa::EcdsaChannelSigner;
 use crate::sign::{EntropySource, PeerStorageKey, SignerProvider};
 use crate::sync::{Mutex, MutexGuard, RwLock, RwLockReadGuard};
 use crate::types::features::{InitFeatures, NodeFeatures};
-use crate::util::async_poll::{MaybeSend, MaybeSync};
 use crate::util::errors::APIError;
 use crate::util::logger::{Logger, WithContext};
-use crate::util::native_async::FutureSpawner;
+use crate::util::native_async::{FutureSpawner, MaybeSend, MaybeSync};
 use crate::util::persist::{KVStore, MonitorName, MonitorUpdatingPersisterAsync};
 #[cfg(peer_storage)]
 use crate::util::ser::{VecWriter, Writeable};

lightning/src/events/bump_transaction/mod.rs

@@ -37,7 +37,7 @@ use crate::sign::{
 	ChannelDerivationParameters, HTLCDescriptor, SignerProvider, P2WPKH_WITNESS_WEIGHT,
 };
 use crate::sync::Mutex;
-use crate::util::async_poll::{MaybeSend, MaybeSync};
+use crate::util::native_async::{MaybeSend, MaybeSync};
 use crate::util::logger::Logger;
 
 use bitcoin::amount::Amount;

lightning/src/events/bump_transaction/sync.rs

@@ -18,8 +18,9 @@ use crate::chain::chaininterface::BroadcasterInterface;
 use crate::chain::ClaimId;
 use crate::prelude::*;
 use crate::sign::SignerProvider;
-use crate::util::async_poll::{dummy_waker, MaybeSend, MaybeSync};
+use crate::util::async_poll::dummy_waker;
 use crate::util::logger::Logger;
+use crate::util::native_async::{MaybeSend, MaybeSync};
 
 use bitcoin::{Psbt, ScriptBuf, Transaction, TxOut};
 

lightning/src/sign/mod.rs

@@ -58,7 +58,7 @@ use crate::ln::script::ShutdownScript;
 use crate::offers::invoice::UnsignedBolt12Invoice;
 use crate::types::features::ChannelTypeFeatures;
 use crate::types::payment::PaymentPreimage;
-use crate::util::async_poll::MaybeSend;
+use crate::util::native_async::MaybeSend;
 use crate::util::ser::{ReadableArgs, Writeable};
 use crate::util::transaction_utils;
 

lightning/src/util/async_poll.rs

@@ -164,31 +164,3 @@ const DUMMY_WAKER_VTABLE: RawWakerVTable = RawWakerVTable::new(
 pub(crate) fn dummy_waker() -> Waker {
 	unsafe { Waker::from_raw(RawWaker::new(core::ptr::null(), &DUMMY_WAKER_VTABLE)) }
 }
-
-/// Marker trait to optionally implement `Sync` under std.
-///
-/// This is not exported to bindings users as async is only supported in Rust.
-#[cfg(feature = "std")]
-pub use core::marker::Sync as MaybeSync;
-
-#[cfg(not(feature = "std"))]
-/// Marker trait to optionally implement `Sync` under std.
-///
-/// This is not exported to bindings users as async is only supported in Rust.
-pub trait MaybeSync {}
-#[cfg(not(feature = "std"))]
-impl<T> MaybeSync for T where T: ?Sized {}
-
-/// Marker trait to optionally implement `Send` under std.
-///
-/// This is not exported to bindings users as async is only supported in Rust.
-#[cfg(feature = "std")]
-pub use core::marker::Send as MaybeSend;
-
-#[cfg(not(feature = "std"))]
-/// Marker trait to optionally implement `Send` under std.
-///
-/// This is not exported to bindings users as async is only supported in Rust.
-pub trait MaybeSend {}
-#[cfg(not(feature = "std"))]
-impl<T> MaybeSend for T where T: ?Sized {}

lightning/src/util/mod.rs

@@ -20,7 +20,7 @@ pub mod mut_global;
 
 pub mod anchor_channel_reserves;
 
-pub mod async_poll;
+pub(crate) mod async_poll;
 #[cfg(fuzzing)]
 pub mod base32;
 #[cfg(not(fuzzing))]

lightning/src/util/native_async.rs

@@ -9,8 +9,9 @@
 
 #[cfg(all(test, feature = "std"))]
 use crate::sync::{Arc, Mutex};
-use crate::util::async_poll::{MaybeSend, MaybeSync};
 
+#[cfg(test)]
+use alloc::boxed::Box;
 #[cfg(all(test, not(feature = "std")))]
 use alloc::rc::Rc;
 
@@ -53,6 +54,34 @@ trait MaybeSendableFuture: Future<Output = ()> + MaybeSend + 'static {}
 #[cfg(test)]
 impl<F: Future<Output = ()> + MaybeSend + 'static> MaybeSendableFuture for F {}
 
+/// Marker trait to optionally implement `Sync` under std.
+///
+/// This is not exported to bindings users as async is only supported in Rust.
+#[cfg(feature = "std")]
+pub use core::marker::Sync as MaybeSync;
+
+#[cfg(not(feature = "std"))]
+/// Marker trait to optionally implement `Sync` under std.
+///
+/// This is not exported to bindings users as async is only supported in Rust.
+pub trait MaybeSync {}
+#[cfg(not(feature = "std"))]
+impl<T> MaybeSync for T where T: ?Sized {}
+
+/// Marker trait to optionally implement `Send` under std.
+///
+/// This is not exported to bindings users as async is only supported in Rust.
+#[cfg(feature = "std")]
+pub use core::marker::Send as MaybeSend;
+
+#[cfg(not(feature = "std"))]
+/// Marker trait to optionally implement `Send` under std.
+///
+/// This is not exported to bindings users as async is only supported in Rust.
+pub trait MaybeSend {}
+#[cfg(not(feature = "std"))]
+impl<T> MaybeSend for T where T: ?Sized {}
+
 /// A simple [`FutureSpawner`] which holds [`Future`]s until they are manually polled via
 /// [`Self::poll_futures`].
 #[cfg(all(test, feature = "std"))]

lightning/src/util/persist.rs

@@ -37,10 +37,10 @@ use crate::ln::types::ChannelId;
 use crate::sign::{ecdsa::EcdsaChannelSigner, EntropySource, SignerProvider};
 use crate::sync::Mutex;
 use crate::util::async_poll::{
-	dummy_waker, MaybeSend, MaybeSync, MultiResultFuturePoller, ResultFuture, TwoFutureJoiner,
+	dummy_waker, MultiResultFuturePoller, ResultFuture, TwoFutureJoiner,
 };
 use crate::util::logger::Logger;
-use crate::util::native_async::FutureSpawner;
+use crate::util::native_async::{FutureSpawner, MaybeSend, MaybeSync};
 use crate::util::ser::{Readable, ReadableArgs, Writeable};
 use crate::util::wakers::Notifier;
 

lightning/src/util/test_utils.rs

@@ -51,14 +51,14 @@ use crate::sign::{self, ReceiveAuthKey};
 use crate::sign::{ChannelSigner, PeerStorageKey};
 use crate::sync::RwLock;
 use crate::types::features::{ChannelFeatures, InitFeatures, NodeFeatures};
-use crate::util::async_poll::MaybeSend;
 use crate::util::config::UserConfig;
 use crate::util::dyn_signer::{
 	DynKeysInterface, DynKeysInterfaceTrait, DynPhantomKeysInterface, DynSigner,
 };
 use crate::util::logger::{Logger, Record};
 #[cfg(feature = "std")]
 use crate::util::mut_global::MutGlobal;
+use crate::util::native_async::MaybeSend;
 use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};