Skip to content

Commit 36ecc8e

Browse files
committed
Re-wrap define_run_body macro parameters
Some code hygiene before another parameter is added and rustfmt is eventually used.
1 parent ae98517 commit 36ecc8e

File tree

1 file changed

+16
-11
lines changed
  • lightning-background-processor/src

1 file changed

+16
-11
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,13 @@ fn update_scorer<'a, S: 'static + Deref<Target = SC> + Send + Sync, SC: 'a + Wri
270270
}
271271

272272
macro_rules! define_run_body {
273-
($persister: ident, $chain_monitor: ident, $process_chain_monitor_events: expr,
274-
$channel_manager: ident, $process_channel_manager_events: expr,
275-
$gossip_sync: ident, $peer_manager: ident, $logger: ident, $scorer: ident,
276-
$loop_exit_check: expr, $await: expr, $get_timer: expr, $timer_elapsed: expr,
277-
$check_slow_await: expr)
278-
=> { {
273+
(
274+
$persister: ident, $chain_monitor: ident, $process_chain_monitor_events: expr,
275+
$channel_manager: ident, $process_channel_manager_events: expr,
276+
$gossip_sync: ident, $peer_manager: ident, $logger: ident, $scorer: ident,
277+
$loop_exit_check: expr, $await: expr, $get_timer: expr, $timer_elapsed: expr,
278+
$check_slow_await: expr
279+
) => { {
279280
log_trace!($logger, "Calling ChannelManager's timer_tick_occurred on startup");
280281
$channel_manager.timer_tick_occurred();
281282
log_trace!($logger, "Rebroadcasting monitor's pending claims on startup");
@@ -650,8 +651,9 @@ where
650651
event_handler(event).await;
651652
}
652653
};
653-
define_run_body!(persister,
654-
chain_monitor, chain_monitor.process_pending_events_async(async_event_handler).await,
654+
define_run_body!(
655+
persister, chain_monitor,
656+
chain_monitor.process_pending_events_async(async_event_handler).await,
655657
channel_manager, channel_manager.process_pending_events_async(async_event_handler).await,
656658
gossip_sync, peer_manager, logger, scorer, should_break, {
657659
let fut = Selector {
@@ -673,7 +675,8 @@ where
673675
task::Poll::Ready(exit) => { should_break = exit; true },
674676
task::Poll::Pending => false,
675677
}
676-
}, mobile_interruptable_platform)
678+
}, mobile_interruptable_platform
679+
)
677680
}
678681

679682
#[cfg(feature = "std")]
@@ -782,14 +785,16 @@ impl BackgroundProcessor {
782785
}
783786
event_handler.handle_event(event);
784787
};
785-
define_run_body!(persister, chain_monitor, chain_monitor.process_pending_events(&event_handler),
788+
define_run_body!(
789+
persister, chain_monitor, chain_monitor.process_pending_events(&event_handler),
786790
channel_manager, channel_manager.process_pending_events(&event_handler),
787791
gossip_sync, peer_manager, logger, scorer, stop_thread.load(Ordering::Acquire),
788792
{ Sleeper::from_two_futures(
789793
channel_manager.get_event_or_persistence_needed_future(),
790794
chain_monitor.get_update_future()
791795
).wait_timeout(Duration::from_millis(100)); },
792-
|_| Instant::now(), |time: &Instant, dur| time.elapsed().as_secs() > dur, false)
796+
|_| Instant::now(), |time: &Instant, dur| time.elapsed().as_secs() > dur, false
797+
)
793798
});
794799
Self { stop_thread: stop_thread_clone, thread_handle: Some(handle) }
795800
}

0 commit comments

Comments
 (0)