Use treefmt to format rust code

Author: Joseph Goulden

ldk-server-cli/src/main.rs

@@ -11,7 +11,7 @@ use ldk_server_client::ldk_server_protos::api::{
 	OpenChannelRequest,
 };
 use ldk_server_client::ldk_server_protos::types::{
-	bolt11_invoice_description, Bolt11InvoiceDescription, PageToken, Payment,
+	Bolt11InvoiceDescription, PageToken, Payment, bolt11_invoice_description,
 };
 use std::fmt::Debug;
 

ldk-server-client/src/client.rs

@@ -14,8 +14,8 @@ use ldk_server_protos::api::{
 	OpenChannelRequest, OpenChannelResponse,
 };
 use ldk_server_protos::error::{ErrorCode, ErrorResponse};
-use reqwest::header::CONTENT_TYPE;
 use reqwest::Client;
+use reqwest::header::CONTENT_TYPE;
 
 const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";
 

ldk-server/src/api/close_channel.rs

@@ -1,8 +1,8 @@
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 use crate::service::Context;
-use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::UserChannelId;
+use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_server_protos::api::{
 	CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
 };

ldk-server/src/api/onchain_send.rs

@@ -33,7 +33,7 @@ pub(crate) fn handle_onchain_send_request(
 			return Err(LdkServerError::new(
 				InvalidRequestError,
 				"Must specify either `send_all` or `amount_sats`, but not both or neither",
-			))
+			));
 		},
 	};
 	let response = OnchainSendResponse { txid: txid.to_string() };

ldk-server/src/api/update_channel_config.rs

@@ -1,9 +1,9 @@
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
 use crate::service::Context;
+use ldk_node::UserChannelId;
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
-use ldk_node::UserChannelId;
 use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
 use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;
 use std::str::FromStr;

ldk-server/src/io/events/rabbitmq/mod.rs

@@ -148,12 +148,12 @@ impl EventPublisher for RabbitMqEventPublisher {
 mod integration_tests_events_rabbitmq {
 	use super::*;
 	use lapin::{
+		Channel, Connection,
 		options::{BasicAckOptions, BasicConsumeOptions, QueueBindOptions, QueueDeclareOptions},
 		types::FieldTable,
-		Channel, Connection,
 	};
-	use ldk_server_protos::events::event_envelope::Event;
 	use ldk_server_protos::events::PaymentForwarded;
+	use ldk_server_protos::events::event_envelope::Event;
 	use std::io;
 	use std::time::Duration;
 	use tokio;

ldk-server/src/io/persist/sqlite_store/mod.rs

@@ -1,7 +1,7 @@
 use crate::io::persist::paginated_kv_store::{ListResponse, PaginatedKVStore};
 use crate::io::utils::check_namespace_key_validity;
 use ldk_node::lightning::types::string::PrintableString;
-use rusqlite::{named_params, Connection};
+use rusqlite::{Connection, named_params};
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::{fs, io};
@@ -123,9 +123,10 @@ impl SqliteStore {
 		check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "read")?;
 
 		let locked_conn = self.connection.lock().unwrap();
-		let sql =
-			format!("SELECT value FROM {} WHERE primary_namespace=:primary_namespace AND secondary_namespace=:secondary_namespace AND key=:key;",
-							kv_table_name);
+		let sql = format!(
+			"SELECT value FROM {} WHERE primary_namespace=:primary_namespace AND secondary_namespace=:secondary_namespace AND key=:key;",
+			kv_table_name
+		);
 
 		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
 			let msg = format!("Failed to prepare statement: {}", e);
@@ -172,7 +173,10 @@ impl SqliteStore {
 
 		let locked_conn = self.connection.lock().unwrap();
 
-		let sql = format!("DELETE FROM {} WHERE primary_namespace=:primary_namespace AND secondary_namespace=:secondary_namespace AND key=:key;", kv_table_name);
+		let sql = format!(
+			"DELETE FROM {} WHERE primary_namespace=:primary_namespace AND secondary_namespace=:secondary_namespace AND key=:key;",
+			kv_table_name
+		);
 
 		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
 			let msg = format!("Failed to prepare statement: {}", e);
@@ -330,7 +334,7 @@ mod tests {
 	use super::*;
 	use ldk_node::lightning::util::persist::KVSTORE_NAMESPACE_KEY_MAX_LEN;
 	use rand::distributions::Alphanumeric;
-	use rand::{thread_rng, Rng};
+	use rand::{Rng, thread_rng};
 	use std::panic::RefUnwindSafe;
 
 	impl Drop for SqliteStore {

ldk-server/src/io/utils.rs

@@ -20,8 +20,11 @@ pub(crate) fn check_namespace_key_validity(
 
 		if primary_namespace.is_empty() && !secondary_namespace.is_empty() {
 			let msg = format!(
-				"Failed to {} {}/{}/{}: primary namespace may not be empty if a non-empty secondary namespace is given.", operation,
-				PrintableString(primary_namespace), PrintableString(secondary_namespace), PrintableString(key)
+				"Failed to {} {}/{}/{}: primary namespace may not be empty if a non-empty secondary namespace is given.",
+				operation,
+				PrintableString(primary_namespace),
+				PrintableString(secondary_namespace),
+				PrintableString(key)
 			);
 			return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
 		}
@@ -43,7 +46,9 @@ pub(crate) fn check_namespace_key_validity(
 		if primary_namespace.is_empty() && !secondary_namespace.is_empty() {
 			let msg = format!(
 				"Failed to {} {}/{}: primary namespace may not be empty if a non-empty secondary namespace is given.",
-				operation, PrintableString(primary_namespace), PrintableString(secondary_namespace)
+				operation,
+				PrintableString(primary_namespace),
+				PrintableString(secondary_namespace)
 			);
 			return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
 		}

ldk-server/src/main.rs

@@ -32,7 +32,7 @@ use ldk_node::lightning::ln::channelmanager::PaymentId;
 #[cfg(feature = "experimental-lsps2-support")]
 use ldk_node::liquidity::LSPS2ServiceConfig;
 use ldk_server_protos::events;
-use ldk_server_protos::events::{event_envelope, EventEnvelope};
+use ldk_server_protos::events::{EventEnvelope, event_envelope};
 use ldk_server_protos::types::Payment;
 use prost::Message;
 use rand::Rng;

ldk-server/src/service.rs

@@ -7,31 +7,31 @@ use hyper::{Request, Response, StatusCode};
 
 use prost::Message;
 
-use crate::api::bolt11_receive::{handle_bolt11_receive_request, BOLT11_RECEIVE_PATH};
-use crate::api::bolt11_send::{handle_bolt11_send_request, BOLT11_SEND_PATH};
-use crate::api::bolt12_receive::{handle_bolt12_receive_request, BOLT12_RECEIVE_PATH};
-use crate::api::bolt12_send::{handle_bolt12_send_request, BOLT12_SEND_PATH};
+use crate::api::bolt11_receive::{BOLT11_RECEIVE_PATH, handle_bolt11_receive_request};
+use crate::api::bolt11_send::{BOLT11_SEND_PATH, handle_bolt11_send_request};
+use crate::api::bolt12_receive::{BOLT12_RECEIVE_PATH, handle_bolt12_receive_request};
+use crate::api::bolt12_send::{BOLT12_SEND_PATH, handle_bolt12_send_request};
 use crate::api::close_channel::{
-	handle_close_channel_request, handle_force_close_channel_request, CLOSE_CHANNEL_PATH,
-	FORCE_CLOSE_CHANNEL_PATH,
+	CLOSE_CHANNEL_PATH, FORCE_CLOSE_CHANNEL_PATH, handle_close_channel_request,
+	handle_force_close_channel_request,
 };
 use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
-use crate::api::get_balances::{handle_get_balances_request, GET_BALANCES};
-use crate::api::get_node_info::{handle_get_node_info_request, GET_NODE_INFO};
+use crate::api::get_balances::{GET_BALANCES, handle_get_balances_request};
+use crate::api::get_node_info::{GET_NODE_INFO, handle_get_node_info_request};
 use crate::api::get_payment_details::{
-	handle_get_payment_details_request, GET_PAYMENT_DETAILS_PATH,
+	GET_PAYMENT_DETAILS_PATH, handle_get_payment_details_request,
 };
-use crate::api::list_channels::{handle_list_channels_request, LIST_CHANNELS_PATH};
+use crate::api::list_channels::{LIST_CHANNELS_PATH, handle_list_channels_request};
 use crate::api::list_forwarded_payments::{
-	handle_list_forwarded_payments_request, LIST_FORWARDED_PAYMENTS_PATH,
+	LIST_FORWARDED_PAYMENTS_PATH, handle_list_forwarded_payments_request,
 };
-use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH};
-use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
-use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
-use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
+use crate::api::list_payments::{LIST_PAYMENTS_PATH, handle_list_payments_request};
+use crate::api::onchain_receive::{ONCHAIN_RECEIVE_PATH, handle_onchain_receive_request};
+use crate::api::onchain_send::{ONCHAIN_SEND_PATH, handle_onchain_send_request};
+use crate::api::open_channel::{OPEN_CHANNEL_PATH, handle_open_channel};
 use crate::api::update_channel_config::{
-	handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
+	UPDATE_CHANNEL_CONFIG_PATH, handle_update_channel_config_request,
 };
 use crate::io::persist::paginated_kv_store::PaginatedKVStore;
 use crate::util::proto_adapter::to_error_response;