diff --git a/ldk-server-client/src/client.rs b/ldk-server-client/src/client.rs
index 354bde92..526b7375 100644
--- a/ldk-server-client/src/client.rs
+++ b/ldk-server-client/src/client.rs
@@ -15,7 +15,6 @@ use bitcoin_hashes::{sha256, Hash, HashEngine};
 use hyper::body::HttpBody as _;
 use hyper::{Body as HyperBody, Client as HyperClient, Request as HyperRequest, Version};
 use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
-use ldk_server_grpc::api::SubscribeEventsRequest;
 use ldk_server_grpc::api::{
 	Bolt11ClaimForHashRequest, Bolt11ClaimForHashResponse, Bolt11FailForHashRequest,
 	Bolt11FailForHashResponse, Bolt11ReceiveForHashRequest, Bolt11ReceiveForHashResponse,
@@ -36,8 +35,9 @@ use ldk_server_grpc::api::{
 	OnchainReceiveRequest, OnchainReceiveResponse, OnchainSendRequest, OnchainSendResponse,
 	OpenChannelRequest, OpenChannelResponse, SignMessageRequest, SignMessageResponse,
 	SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse, SpontaneousSendRequest,
-	SpontaneousSendResponse, UnifiedSendRequest, UnifiedSendResponse, UpdateChannelConfigRequest,
-	UpdateChannelConfigResponse, VerifySignatureRequest, VerifySignatureResponse,
+	SpontaneousSendResponse, SubscribeEventsRequest, UnifiedSendRequest, UnifiedSendResponse,
+	UpdateChannelConfigRequest, UpdateChannelConfigResponse, VerifySignatureRequest,
+	VerifySignatureResponse,
 };
 use ldk_server_grpc::endpoints::{
 	BOLT11_CLAIM_FOR_HASH_PATH, BOLT11_FAIL_FOR_HASH_PATH, BOLT11_RECEIVE_FOR_HASH_PATH,
@@ -59,7 +59,8 @@ use ldk_server_grpc::grpc::{
 	GRPC_STATUS_UNAUTHENTICATED, GRPC_STATUS_UNAVAILABLE,
 };
 use prost::Message;
-use reqwest::{header::HeaderMap, Certificate, Client};
+use reqwest::header::HeaderMap;
+use reqwest::{Certificate, Client};
 use rustls::{ClientConfig, RootCertStore};
 use rustls_pemfile::certs;
 
@@ -660,10 +661,11 @@ fn build_streaming_client(server_cert_pem: &[u8]) -> Result<StreamingClient, Str
 
 #[cfg(test)]
 mod tests {
-	use super::*;
 	use hyper::Body;
 	use reqwest::header::HeaderValue;
 
+	use super::*;
+
 	#[test]
 	fn test_grpc_error_from_headers_ignores_ok_status() {
 		let mut headers = HeaderMap::new();
diff --git a/ldk-server/src/api/bolt11_claim_for_hash.rs b/ldk-server/src/api/bolt11_claim_for_hash.rs
index eb8c477d..d68cfb18 100644
--- a/ldk-server/src/api/bolt11_claim_for_hash.rs
+++ b/ldk-server/src/api/bolt11_claim_for_hash.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::FromHex;
 use ldk_node::bitcoin::hashes::{sha256, Hash};
 use ldk_node::lightning_types::payment::{PaymentHash, PaymentPreimage};
@@ -15,7 +17,6 @@ use ldk_server_grpc::api::{Bolt11ClaimForHashRequest, Bolt11ClaimForHashResponse
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_claim_for_hash_request(
 	context: Arc<Context>, request: Bolt11ClaimForHashRequest,
diff --git a/ldk-server/src/api/bolt11_fail_for_hash.rs b/ldk-server/src/api/bolt11_fail_for_hash.rs
index f25b1125..e65527fe 100644
--- a/ldk-server/src/api/bolt11_fail_for_hash.rs
+++ b/ldk-server/src/api/bolt11_fail_for_hash.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::FromHex;
 use ldk_node::lightning_types::payment::PaymentHash;
 use ldk_server_grpc::api::{Bolt11FailForHashRequest, Bolt11FailForHashResponse};
@@ -14,7 +16,6 @@ use ldk_server_grpc::api::{Bolt11FailForHashRequest, Bolt11FailForHashResponse};
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_fail_for_hash_request(
 	context: Arc<Context>, request: Bolt11FailForHashRequest,
diff --git a/ldk-server/src/api/bolt11_receive.rs b/ldk-server/src/api/bolt11_receive.rs
index 4ae78bd5..4b704d93 100644
--- a/ldk-server/src/api/bolt11_receive.rs
+++ b/ldk-server/src/api/bolt11_receive.rs
@@ -7,13 +7,14 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::DisplayHex;
 use ldk_server_grpc::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
 use crate::util::proto_adapter::proto_to_bolt11_description;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_receive_request(
 	context: Arc<Context>, request: Bolt11ReceiveRequest,
diff --git a/ldk-server/src/api/bolt11_receive_for_hash.rs b/ldk-server/src/api/bolt11_receive_for_hash.rs
index b03154d7..87520438 100644
--- a/ldk-server/src/api/bolt11_receive_for_hash.rs
+++ b/ldk-server/src/api/bolt11_receive_for_hash.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::FromHex;
 use ldk_node::lightning_types::payment::PaymentHash;
 use ldk_server_grpc::api::{Bolt11ReceiveForHashRequest, Bolt11ReceiveForHashResponse};
@@ -15,7 +17,6 @@ use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
 use crate::util::proto_adapter::proto_to_bolt11_description;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_receive_for_hash_request(
 	context: Arc<Context>, request: Bolt11ReceiveForHashRequest,
diff --git a/ldk-server/src/api/bolt11_receive_via_jit_channel.rs b/ldk-server/src/api/bolt11_receive_via_jit_channel.rs
index 8078e5f0..72314580 100644
--- a/ldk-server/src/api/bolt11_receive_via_jit_channel.rs
+++ b/ldk-server/src/api/bolt11_receive_via_jit_channel.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{
 	Bolt11ReceiveVariableAmountViaJitChannelRequest,
 	Bolt11ReceiveVariableAmountViaJitChannelResponse, Bolt11ReceiveViaJitChannelRequest,
@@ -16,7 +18,6 @@ use ldk_server_grpc::api::{
 use crate::api::error::LdkServerError;
 use crate::service::Context;
 use crate::util::proto_adapter::proto_to_bolt11_description;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_receive_via_jit_channel_request(
 	context: Arc<Context>, request: Bolt11ReceiveViaJitChannelRequest,
diff --git a/ldk-server/src/api/bolt11_send.rs b/ldk-server/src/api/bolt11_send.rs
index 36bdb957..2ee55c33 100644
--- a/ldk-server/src/api/bolt11_send.rs
+++ b/ldk-server/src/api/bolt11_send.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::lightning_invoice::Bolt11Invoice;
 use ldk_server_grpc::api::{Bolt11SendRequest, Bolt11SendResponse};
@@ -15,7 +16,6 @@ use ldk_server_grpc::api::{Bolt11SendRequest, Bolt11SendResponse};
 use crate::api::build_route_parameters_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt11_send_request(
 	context: Arc<Context>, request: Bolt11SendRequest,
diff --git a/ldk-server/src/api/bolt12_receive.rs b/ldk-server/src/api/bolt12_receive.rs
index e0e6659d..6558a6d8 100644
--- a/ldk-server/src/api/bolt12_receive.rs
+++ b/ldk-server/src/api/bolt12_receive.rs
@@ -7,12 +7,13 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::DisplayHex;
 use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt12_receive_request(
 	context: Arc<Context>, request: Bolt12ReceiveRequest,
diff --git a/ldk-server/src/api/bolt12_send.rs b/ldk-server/src/api/bolt12_send.rs
index ae72623a..0c997fb2 100644
--- a/ldk-server/src/api/bolt12_send.rs
+++ b/ldk-server/src/api/bolt12_send.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::lightning::offers::offer::Offer;
 use ldk_server_grpc::api::{Bolt12SendRequest, Bolt12SendResponse};
@@ -15,7 +16,6 @@ use ldk_server_grpc::api::{Bolt12SendRequest, Bolt12SendResponse};
 use crate::api::build_route_parameters_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_bolt12_send_request(
 	context: Arc<Context>, request: Bolt12SendRequest,
diff --git a/ldk-server/src/api/close_channel.rs b/ldk-server/src/api/close_channel.rs
index 5afa6405..a83dd8db 100644
--- a/ldk-server/src/api/close_channel.rs
+++ b/ldk-server/src/api/close_channel.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::UserChannelId;
@@ -18,7 +19,6 @@ use ldk_server_grpc::api::{
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_close_channel_request(
 	context: Arc<Context>, request: CloseChannelRequest,
diff --git a/ldk-server/src/api/connect_peer.rs b/ldk-server/src/api/connect_peer.rs
index b6373f0f..e360f7ba 100644
--- a/ldk-server/src/api/connect_peer.rs
+++ b/ldk-server/src/api/connect_peer.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::lightning::ln::msgs::SocketAddress;
@@ -15,7 +16,6 @@ use ldk_server_grpc::api::{ConnectPeerRequest, ConnectPeerResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_connect_peer(
 	context: Arc<Context>, request: ConnectPeerRequest,
diff --git a/ldk-server/src/api/decode_invoice.rs b/ldk-server/src/api/decode_invoice.rs
index 4478b31b..e12b9de1 100644
--- a/ldk-server/src/api/decode_invoice.rs
+++ b/ldk-server/src/api/decode_invoice.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use hex::prelude::*;
 use ldk_node::lightning_invoice::Bolt11Invoice;
@@ -18,7 +19,6 @@ use ldk_server_grpc::types::{Bolt11HopHint, Bolt11RouteHint};
 use crate::api::decode_features;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_decode_invoice_request(
 	_context: Arc<Context>, request: DecodeInvoiceRequest,
diff --git a/ldk-server/src/api/decode_offer.rs b/ldk-server/src/api/decode_offer.rs
index b206f485..6d341004 100644
--- a/ldk-server/src/api/decode_offer.rs
+++ b/ldk-server/src/api/decode_offer.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use hex::prelude::*;
 use ldk_node::lightning::bitcoin::blockdata::constants::ChainHash;
@@ -22,7 +23,6 @@ use ldk_server_grpc::types::{BlindedPath, CurrencyAmount, OfferAmount, OfferQuan
 use crate::api::decode_features;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_decode_offer_request(
 	_context: Arc<Context>, request: DecodeOfferRequest,
diff --git a/ldk-server/src/api/disconnect_peer.rs b/ldk-server/src/api/disconnect_peer.rs
index 9b4556aa..63141fb6 100644
--- a/ldk-server/src/api/disconnect_peer.rs
+++ b/ldk-server/src/api/disconnect_peer.rs
@@ -8,13 +8,13 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_server_grpc::api::{DisconnectPeerRequest, DisconnectPeerResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_disconnect_peer(
 	context: Arc<Context>, request: DisconnectPeerRequest,
diff --git a/ldk-server/src/api/export_pathfinding_scores.rs b/ldk-server/src/api/export_pathfinding_scores.rs
index c81c0569..a275243f 100644
--- a/ldk-server/src/api/export_pathfinding_scores.rs
+++ b/ldk-server/src/api/export_pathfinding_scores.rs
@@ -7,11 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{ExportPathfindingScoresRequest, ExportPathfindingScoresResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_export_pathfinding_scores_request(
 	context: Arc<Context>, _request: ExportPathfindingScoresRequest,
diff --git a/ldk-server/src/api/get_balances.rs b/ldk-server/src/api/get_balances.rs
index 8dec0f65..f647672d 100644
--- a/ldk-server/src/api/get_balances.rs
+++ b/ldk-server/src/api/get_balances.rs
@@ -7,12 +7,13 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{GetBalancesRequest, GetBalancesResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
 use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
-use std::sync::Arc;
 
 pub(crate) async fn handle_get_balances_request(
 	context: Arc<Context>, _request: GetBalancesRequest,
diff --git a/ldk-server/src/api/get_node_info.rs b/ldk-server/src/api/get_node_info.rs
index e6a30dcc..862b144d 100644
--- a/ldk-server/src/api/get_node_info.rs
+++ b/ldk-server/src/api/get_node_info.rs
@@ -7,12 +7,13 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{GetNodeInfoRequest, GetNodeInfoResponse};
 use ldk_server_grpc::types::BestBlock;
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_get_node_info_request(
 	context: Arc<Context>, _request: GetNodeInfoRequest,
diff --git a/ldk-server/src/api/get_payment_details.rs b/ldk-server/src/api/get_payment_details.rs
index cf388e67..e7d58a79 100644
--- a/ldk-server/src/api/get_payment_details.rs
+++ b/ldk-server/src/api/get_payment_details.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use hex::FromHex;
 use ldk_node::lightning::ln::channelmanager::PaymentId;
 use ldk_server_grpc::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};
@@ -15,7 +17,6 @@ use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
 use crate::util::proto_adapter::payment_to_proto;
-use std::sync::Arc;
 
 pub(crate) async fn handle_get_payment_details_request(
 	context: Arc<Context>, request: GetPaymentDetailsRequest,
diff --git a/ldk-server/src/api/graph_get_channel.rs b/ldk-server/src/api/graph_get_channel.rs
index 2fc5b296..d465957a 100644
--- a/ldk-server/src/api/graph_get_channel.rs
+++ b/ldk-server/src/api/graph_get_channel.rs
@@ -7,13 +7,14 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{GraphGetChannelRequest, GraphGetChannelResponse};
 
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
 use crate::util::proto_adapter::graph_channel_to_proto;
-use std::sync::Arc;
 
 pub(crate) async fn handle_graph_get_channel_request(
 	context: Arc<Context>, request: GraphGetChannelRequest,
diff --git a/ldk-server/src/api/graph_get_node.rs b/ldk-server/src/api/graph_get_node.rs
index 40db9894..412eb683 100644
--- a/ldk-server/src/api/graph_get_node.rs
+++ b/ldk-server/src/api/graph_get_node.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_node::lightning::routing::gossip::NodeId;
 use ldk_server_grpc::api::{GraphGetNodeRequest, GraphGetNodeResponse};
 
@@ -14,7 +16,6 @@ use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
 use crate::util::proto_adapter::graph_node_to_proto;
-use std::sync::Arc;
 
 pub(crate) async fn handle_graph_get_node_request(
 	context: Arc<Context>, request: GraphGetNodeRequest,
diff --git a/ldk-server/src/api/graph_list_channels.rs b/ldk-server/src/api/graph_list_channels.rs
index 1236b539..9ca8b893 100644
--- a/ldk-server/src/api/graph_list_channels.rs
+++ b/ldk-server/src/api/graph_list_channels.rs
@@ -7,11 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{GraphListChannelsRequest, GraphListChannelsResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_graph_list_channels_request(
 	context: Arc<Context>, _request: GraphListChannelsRequest,
diff --git a/ldk-server/src/api/graph_list_nodes.rs b/ldk-server/src/api/graph_list_nodes.rs
index 24ed8f7a..56c48e90 100644
--- a/ldk-server/src/api/graph_list_nodes.rs
+++ b/ldk-server/src/api/graph_list_nodes.rs
@@ -7,11 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{GraphListNodesRequest, GraphListNodesResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_graph_list_nodes_request(
 	context: Arc<Context>, _request: GraphListNodesRequest,
diff --git a/ldk-server/src/api/list_channels.rs b/ldk-server/src/api/list_channels.rs
index e7c832e3..59a1d337 100644
--- a/ldk-server/src/api/list_channels.rs
+++ b/ldk-server/src/api/list_channels.rs
@@ -7,12 +7,13 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{ListChannelsRequest, ListChannelsResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
 use crate::util::proto_adapter::channel_to_proto;
-use std::sync::Arc;
 
 pub(crate) async fn handle_list_channels_request(
 	context: Arc<Context>, _request: ListChannelsRequest,
diff --git a/ldk-server/src/api/list_forwarded_payments.rs b/ldk-server/src/api/list_forwarded_payments.rs
index 7d79fda7..f784c457 100644
--- a/ldk-server/src/api/list_forwarded_payments.rs
+++ b/ldk-server/src/api/list_forwarded_payments.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use bytes::Bytes;
 use ldk_server_grpc::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
 use ldk_server_grpc::types::{ForwardedPayment, PageToken};
@@ -19,7 +21,6 @@ use crate::io::persist::{
 	FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_list_forwarded_payments_request(
 	context: Arc<Context>, request: ListForwardedPaymentsRequest,
diff --git a/ldk-server/src/api/list_payments.rs b/ldk-server/src/api/list_payments.rs
index 8d58068a..502d7458 100644
--- a/ldk-server/src/api/list_payments.rs
+++ b/ldk-server/src/api/list_payments.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use bytes::Bytes;
 use ldk_server_grpc::api::{ListPaymentsRequest, ListPaymentsResponse};
 use ldk_server_grpc::types::{PageToken, Payment};
@@ -18,7 +20,6 @@ use crate::io::persist::{
 	PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_list_payments_request(
 	context: Arc<Context>, request: ListPaymentsRequest,
diff --git a/ldk-server/src/api/list_peers.rs b/ldk-server/src/api/list_peers.rs
index 9c452e43..b290049c 100644
--- a/ldk-server/src/api/list_peers.rs
+++ b/ldk-server/src/api/list_peers.rs
@@ -7,12 +7,13 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{ListPeersRequest, ListPeersResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
 use crate::util::proto_adapter::peer_to_proto;
-use std::sync::Arc;
 
 pub(crate) async fn handle_list_peers_request(
 	context: Arc<Context>, _request: ListPeersRequest,
diff --git a/ldk-server/src/api/onchain_receive.rs b/ldk-server/src/api/onchain_receive.rs
index 8dd367c3..481acb79 100644
--- a/ldk-server/src/api/onchain_receive.rs
+++ b/ldk-server/src/api/onchain_receive.rs
@@ -7,11 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{OnchainReceiveRequest, OnchainReceiveResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_onchain_receive_request(
 	context: Arc<Context>, _request: OnchainReceiveRequest,
diff --git a/ldk-server/src/api/onchain_send.rs b/ldk-server/src/api/onchain_send.rs
index 3a52c22a..ea616a17 100644
--- a/ldk-server/src/api/onchain_send.rs
+++ b/ldk-server/src/api/onchain_send.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::{Address, FeeRate};
 use ldk_server_grpc::api::{OnchainSendRequest, OnchainSendResponse};
@@ -15,7 +16,6 @@ use ldk_server_grpc::api::{OnchainSendRequest, OnchainSendResponse};
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_onchain_send_request(
 	context: Arc<Context>, request: OnchainSendRequest,
diff --git a/ldk-server/src/api/open_channel.rs b/ldk-server/src/api/open_channel.rs
index 9069fde9..243263b8 100644
--- a/ldk-server/src/api/open_channel.rs
+++ b/ldk-server/src/api/open_channel.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::config::ChannelConfig;
@@ -17,7 +18,6 @@ use ldk_server_grpc::api::{OpenChannelRequest, OpenChannelResponse};
 use crate::api::build_channel_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_open_channel(
 	context: Arc<Context>, request: OpenChannelRequest,
diff --git a/ldk-server/src/api/sign_message.rs b/ldk-server/src/api/sign_message.rs
index 73d5ed5a..839e565b 100644
--- a/ldk-server/src/api/sign_message.rs
+++ b/ldk-server/src/api/sign_message.rs
@@ -7,11 +7,12 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_server_grpc::api::{SignMessageRequest, SignMessageResponse};
 
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_sign_message_request(
 	context: Arc<Context>, request: SignMessageRequest,
diff --git a/ldk-server/src/api/splice_channel.rs b/ldk-server/src/api/splice_channel.rs
index 51b85688..52a6989d 100644
--- a/ldk-server/src/api/splice_channel.rs
+++ b/ldk-server/src/api/splice_channel.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::bitcoin::Address;
@@ -19,7 +20,6 @@ use ldk_server_grpc::api::{
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_splice_in_request(
 	context: Arc<Context>, request: SpliceInRequest,
diff --git a/ldk-server/src/api/spontaneous_send.rs b/ldk-server/src/api/spontaneous_send.rs
index 45d5b3f1..507d3882 100644
--- a/ldk-server/src/api/spontaneous_send.rs
+++ b/ldk-server/src/api/spontaneous_send.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_server_grpc::api::{SpontaneousSendRequest, SpontaneousSendResponse};
@@ -16,7 +17,6 @@ use crate::api::build_route_parameters_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_spontaneous_send_request(
 	context: Arc<Context>, request: SpontaneousSendRequest,
diff --git a/ldk-server/src/api/unified_send.rs b/ldk-server/src/api/unified_send.rs
index d5038315..4f72f733 100644
--- a/ldk-server/src/api/unified_send.rs
+++ b/ldk-server/src/api/unified_send.rs
@@ -7,6 +7,8 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
+use std::sync::Arc;
+
 use ldk_node::payment::UnifiedPaymentResult;
 use ldk_server_grpc::api::unified_send_response::PaymentResult;
 use ldk_server_grpc::api::{UnifiedSendRequest, UnifiedSendResponse};
@@ -14,7 +16,6 @@ use ldk_server_grpc::api::{UnifiedSendRequest, UnifiedSendResponse};
 use crate::api::build_route_parameters_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_unified_send_request(
 	context: Arc<Context>, request: UnifiedSendRequest,
diff --git a/ldk-server/src/api/update_channel_config.rs b/ldk-server/src/api/update_channel_config.rs
index dd2ae61a..4a24c037 100644
--- a/ldk-server/src/api/update_channel_config.rs
+++ b/ldk-server/src/api/update_channel_config.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::UserChannelId;
@@ -17,7 +18,6 @@ use crate::api::build_channel_config_from_proto;
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_update_channel_config_request(
 	context: Arc<Context>, request: UpdateChannelConfigRequest,
diff --git a/ldk-server/src/api/verify_signature.rs b/ldk-server/src/api/verify_signature.rs
index 0eaec830..b13761d2 100644
--- a/ldk-server/src/api/verify_signature.rs
+++ b/ldk-server/src/api/verify_signature.rs
@@ -8,6 +8,7 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_server_grpc::api::{VerifySignatureRequest, VerifySignatureResponse};
@@ -15,7 +16,6 @@ use ldk_server_grpc::api::{VerifySignatureRequest, VerifySignatureResponse};
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use std::sync::Arc;
 
 pub(crate) async fn handle_verify_signature_request(
 	context: Arc<Context>, request: VerifySignatureRequest,
diff --git a/ldk-server/src/service.rs b/ldk-server/src/service.rs
index a0111df3..452c1699 100644
--- a/ldk-server/src/service.rs
+++ b/ldk-server/src/service.rs
@@ -39,8 +39,7 @@ use ldk_server_grpc::grpc::{
 	GRPC_STATUS_UNAUTHENTICATED, GRPC_STATUS_UNAVAILABLE, GRPC_STATUS_UNIMPLEMENTED,
 };
 use prost::Message;
-use tokio::sync::broadcast;
-use tokio::sync::mpsc;
+use tokio::sync::{broadcast, mpsc};
 
 use crate::api::bolt11_claim_for_hash::handle_bolt11_claim_for_hash_request;
 use crate::api::bolt11_fail_for_hash::handle_bolt11_fail_for_hash_request;