Move RuntimeSpawner to runtime.rs

In a few commits as we upgrade LDK we'll use `RuntimeSpawner`
outside of gossip, making it make much more sense to have it in
`runtime.rs` instead.

Author: TheBlueMatt

src/gossip.rs

@@ -5,18 +5,16 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
-use std::future::Future;
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
-use lightning::util::native_async::FutureSpawner;
 use lightning_block_sync::gossip::GossipVerifier;
 
 use crate::chain::ChainSource;
 use crate::config::RGS_SYNC_TIMEOUT_SECS;
 use crate::logger::{log_trace, LdkLogger, Logger};
-use crate::runtime::Runtime;
+use crate::runtime::{Runtime, RuntimeSpawner};
 use crate::types::{GossipSync, Graph, P2PGossipSync, RapidGossipSync};
 use crate::Error;
 
@@ -114,19 +112,3 @@ impl GossipSource {
 		}
 	}
 }
-
-pub(crate) struct RuntimeSpawner {
-	runtime: Arc<Runtime>,
-}
-
-impl RuntimeSpawner {
-	pub(crate) fn new(runtime: Arc<Runtime>) -> Self {
-		Self { runtime }
-	}
-}
-
-impl FutureSpawner for RuntimeSpawner {
-	fn spawn<T: Future<Output = ()> + Send + 'static>(&self, future: T) {
-		self.runtime.spawn_cancellable_background_task(future);
-	}
-}

src/runtime.rs

@@ -9,6 +9,8 @@ use std::future::Future;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
+use lightning::util::native_async::FutureSpawner;
+
 use tokio::task::{JoinHandle, JoinSet};
 
 use crate::config::{
@@ -219,3 +221,19 @@ enum RuntimeMode {
 	Owned(tokio::runtime::Runtime),
 	Handle(tokio::runtime::Handle),
 }
+
+pub(crate) struct RuntimeSpawner {
+	runtime: Arc<Runtime>,
+}
+
+impl RuntimeSpawner {
+	pub(crate) fn new(runtime: Arc<Runtime>) -> Self {
+		Self { runtime }
+	}
+}
+
+impl FutureSpawner for RuntimeSpawner {
+	fn spawn<T: Future<Output = ()> + Send + 'static>(&self, future: T) {
+		self.runtime.spawn_cancellable_background_task(future);
+	}
+}

src/types.rs

@@ -35,10 +35,10 @@ use crate::chain::ChainSource;
 use crate::config::ChannelConfig;
 use crate::data_store::DataStore;
 use crate::fee_estimator::OnchainFeeEstimator;
-use crate::gossip::RuntimeSpawner;
 use crate::logger::Logger;
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::payment::PaymentDetails;
+use crate::runtime::RuntimeSpawner;
 
 /// A supertrait that requires that a type implements both [`KVStore`] and [`KVStoreSync`] at the
 /// same time.