Skip to content

Commit 4b1326e

Browse files
authored
Merge pull request #942 from tnull/2026-06-cargo-fmt
Run `cargo +nightly fmt` on main
2 parents fb7738f + 4fa33ed commit 4b1326e

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

src/io/vss_store.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,8 @@ impl VssStoreInner {
421421

422422
async fn list_keys(
423423
&self, client: &VssClient<CustomRetryPolicy>, primary_namespace: &str,
424-
secondary_namespace: &str, key_prefix: String, page_token: Option<String>, page_size: Option<i32>,
424+
secondary_namespace: &str, key_prefix: String, page_token: Option<String>,
425+
page_size: Option<i32>,
425426
) -> io::Result<(Vec<String>, Option<String>)> {
426427
let request = ListKeyVersionsRequest {
427428
store_id: self.store_id.clone(),
@@ -574,7 +575,14 @@ impl VssStoreInner {
574575
let mut keys = vec![];
575576
loop {
576577
let (page_keys, next_page_token) = self
577-
.list_keys(client, &primary_namespace, &secondary_namespace, key_prefix.clone(), page_token, None)
578+
.list_keys(
579+
client,
580+
&primary_namespace,
581+
&secondary_namespace,
582+
key_prefix.clone(),
583+
page_token,
584+
None,
585+
)
578586
.await?;
579587
keys.extend(page_keys);
580588
match next_page_token {

src/liquidity/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,23 @@
1010
pub(crate) mod client;
1111
pub(crate) mod service;
1212

13-
pub use client::lsps1::LSPS1Liquidity;
14-
pub use client::LSPS1OrderStatus;
15-
pub use service::lsps2::LSPS2ServiceConfig;
16-
1713
use std::collections::hash_map::Entry;
1814
use std::collections::HashMap;
1915
use std::ops::Deref;
2016
use std::sync::{Arc, Mutex, RwLock};
2117
use std::time::Duration;
2218

2319
use bitcoin::secp256k1::PublicKey;
20+
pub use client::lsps1::LSPS1Liquidity;
21+
pub use client::LSPS1OrderStatus;
2422
use lightning::ln::msgs::SocketAddress;
2523
use lightning_liquidity::events::LiquidityEvent;
2624
use lightning_liquidity::lsps0::event::LSPS0ClientEvent;
2725
use lightning_liquidity::lsps1::client::LSPS1ClientConfig as LdkLSPS1ClientConfig;
2826
use lightning_liquidity::lsps2::client::LSPS2ClientConfig as LdkLSPS2ClientConfig;
2927
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig as LdkLSPS2ServiceConfig;
3028
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
29+
pub use service::lsps2::LSPS2ServiceConfig;
3130
use tokio::sync::oneshot;
3231

3332
use crate::builder::BuildError;

src/runtime.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,10 +381,10 @@ impl FutureSpawner for RuntimeSpawner {
381381

382382
#[cfg(test)]
383383
mod tests {
384-
use super::*;
385-
386384
use tokio::sync::oneshot;
387385

386+
use super::*;
387+
388388
fn test_runtime() -> Runtime {
389389
Runtime::new(Arc::new(Logger::new_log_facade())).unwrap()
390390
}

0 commit comments

Comments
 (0)