From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Thu, 16 Nov 2023 15:03:18 +0000 (-0600)
Subject: Re-order define_run_body macro parameters
X-Git-Tag: v0.0.119~21^2~6
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ce68f223e96767d91d40da67acf61f4a964d60d4;p=rust-lightning

Re-order define_run_body macro parameters

Simply to avoid excessive wrapping when possible.
---

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index f953ba1c..fc080eee 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -273,7 +273,7 @@ macro_rules! define_run_body {
 	(
 		$persister: ident, $chain_monitor: ident, $process_chain_monitor_events: expr,
 		$channel_manager: ident, $process_channel_manager_events: expr,
-		$gossip_sync: ident, $peer_manager: ident, $logger: ident, $scorer: ident,
+		$peer_manager: ident, $gossip_sync: ident, $logger: ident, $scorer: ident,
 		$loop_exit_check: expr, $await: expr, $get_timer: expr, $timer_elapsed: expr,
 		$check_slow_await: expr
 	) => { {
@@ -655,7 +655,7 @@ where
 		persister, chain_monitor,
 		chain_monitor.process_pending_events_async(async_event_handler).await,
 		channel_manager, channel_manager.process_pending_events_async(async_event_handler).await,
-		gossip_sync, peer_manager, logger, scorer, should_break, {
+		peer_manager, gossip_sync, logger, scorer, should_break, {
 			let fut = Selector {
 				a: channel_manager.get_event_or_persistence_needed_future(),
 				b: chain_monitor.get_update_future(),
@@ -788,7 +788,7 @@ impl BackgroundProcessor {
 			define_run_body!(
 				persister, chain_monitor, chain_monitor.process_pending_events(&event_handler),
 				channel_manager, channel_manager.process_pending_events(&event_handler),
-				gossip_sync, peer_manager, logger, scorer, stop_thread.load(Ordering::Acquire),
+				peer_manager, gossip_sync, logger, scorer, stop_thread.load(Ordering::Acquire),
 				{ Sleeper::from_two_futures(
 					channel_manager.get_event_or_persistence_needed_future(),
 					chain_monitor.get_update_future()