Merge pull request #185 from lightningdevkit/create-pull-request/patch

Author: benthecarman

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();

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,

ldk-server/src/api/bolt11_fail_for_hash.rs

@@ -7,14 +7,15 @@
 // 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};
 
 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,

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,

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,

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,

ldk-server/src/api/bolt11_send.rs

@@ -8,14 +8,14 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::lightning_invoice::Bolt11Invoice;
 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,

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,

ldk-server/src/api/bolt12_send.rs

@@ -8,14 +8,14 @@
 // licenses.
 
 use std::str::FromStr;
+use std::sync::Arc;
 
 use ldk_node::lightning::offers::offer::Offer;
 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,

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,