diff --git a/ldk-server-cli/src/pay_wait.rs b/ldk-server-cli/src/pay_wait.rs index f5032a03..62a89e89 100644 --- a/ldk-server-cli/src/pay_wait.rs +++ b/ldk-server-cli/src/pay_wait.rs @@ -12,9 +12,9 @@ use std::time::Duration; use ldk_server_client::client::{EventStream, LdkServerClient}; use ldk_server_client::error::LdkServerError; use ldk_server_client::error::LdkServerErrorCode::InternalError; -use ldk_server_client::ldk_server_grpc::api::unified_send_response; use ldk_server_client::ldk_server_grpc::api::{ - GetPaymentDetailsRequest, GetPaymentDetailsResponse, UnifiedSendRequest, UnifiedSendResponse, + unified_send_response, GetPaymentDetailsRequest, GetPaymentDetailsResponse, UnifiedSendRequest, + UnifiedSendResponse, }; use ldk_server_client::ldk_server_grpc::events::event_envelope::Event; diff --git a/ldk-server-grpc/src/grpc.rs b/ldk-server-grpc/src/grpc.rs index 06deb959..64f13f9e 100644 --- a/ldk-server-grpc/src/grpc.rs +++ b/ldk-server-grpc/src/grpc.rs @@ -402,8 +402,10 @@ mod tests { let s = String::from(b as char); let encoded = percent_encode(&s); let is_unreserved = b.is_ascii_alphanumeric() - || b == b'-' || b == b'_' - || b == b'.' || b == b'~' + || b == b'-' + || b == b'_' + || b == b'.' + || b == b'~' || b == b' '; if is_unreserved { assert_eq!(encoded, s, "byte {b:#04x} ({}) should pass through", b as char); diff --git a/ldk-server-macaroons/src/macaroon.rs b/ldk-server-macaroons/src/macaroon.rs index 8982bf1e..148af5e6 100644 --- a/ldk-server-macaroons/src/macaroon.rs +++ b/ldk-server-macaroons/src/macaroon.rs @@ -13,7 +13,8 @@ //! Third-party caveats and other formats are rejected. //! Format: . -use bitcoin_hashes::{cmp::fixed_time_eq, hmac, sha256, Hash, HashEngine}; +use bitcoin_hashes::cmp::fixed_time_eq; +use bitcoin_hashes::{hmac, sha256, Hash, HashEngine}; use hex_conservative::{DisplayHex, FromHex}; /// Maximum binary token size. Hex transport uses twice this many bytes. diff --git a/ldk-server/src/util/config.rs b/ldk-server/src/util/config.rs index d09bfdf3..16910f06 100644 --- a/ldk-server/src/util/config.rs +++ b/ldk-server/src/util/config.rs @@ -580,7 +580,8 @@ impl ConfigBuilder { self.log_max_size_mb.unwrap_or(DEFAULT_LOG_MAX_SIZE_MB) * 1024 * 1024; let log_rotation_interval_secs = self.log_rotation_interval_hours.unwrap_or(DEFAULT_LOG_ROTATION_INTERVAL_HOURS) - * 60 * 60; + * 60 + * 60; let log_max_files = self.log_max_files.unwrap_or(DEFAULT_LOG_MAX_FILES); let log_to_file = self.log_to_file.unwrap_or(true); @@ -2321,7 +2322,7 @@ mod tests { r#" [node] network = "regtest" - + [bitcoind] rpc_address = "127.0.0.1:8332" rpc_user = "bitcoind-testuser"