f - functions instead of macros

Author: jkczyz

lightning/src/ln/offers_tests.rs

@@ -38,41 +38,35 @@ macro_rules! expect_recent_payment {
 	}
 }
 
-macro_rules! route_payment {
-	($node: expr, $path: expr, $invoice: expr) => {
-		{
-			// Monitor added when handling the invoice onion message.
-			check_added_monitors($node, 1);
-
-			let mut events = $node.node.get_and_clear_pending_msg_events();
-			assert_eq!(events.len(), 1);
-			let ev = remove_first_msg_event_to_node(&$path[0].node.get_our_node_id(), &mut events);
-
-			// Use a fake payment_hash and bypass checking for the PaymentClaimable event since the
-			// invoice contains the payment_hash but it was encrypted inside an onion message.
-			let amount_msats = $invoice.amount_msats();
-			let payment_hash = $invoice.payment_hash();
-			do_pass_along_path(
-				$node, $path, amount_msats, payment_hash, None, ev, false, false, None, false
-			);
-		}
-	}
+fn route_bolt12_payment<'a, 'b, 'c>(
+	node: &Node<'a, 'b, 'c>, path: &[&Node<'a, 'b, 'c>], invoice: &Bolt12Invoice
+) {
+	// Monitor added when handling the invoice onion message.
+	check_added_monitors(node, 1);
+
+	let mut events = node.node.get_and_clear_pending_msg_events();
+	assert_eq!(events.len(), 1);
+	let ev = remove_first_msg_event_to_node(&path[0].node.get_our_node_id(), &mut events);
+
+	// Use a fake payment_hash and bypass checking for the PaymentClaimable event since the
+	// invoice contains the payment_hash but it was encrypted inside an onion message.
+	let amount_msats = invoice.amount_msats();
+	let payment_hash = invoice.payment_hash();
+	do_pass_along_path(
+		node, path, amount_msats, payment_hash, None, ev, false, false, None, false
+	);
 }
 
-macro_rules! claim_payment {
-	($node: expr, $path: expr) => {
-		{
-			let recipient = &$path[$path.len() - 1];
-			match get_event!(recipient, Event::PaymentClaimable) {
-				Event::PaymentClaimable {
-					purpose: PaymentPurpose::InvoicePayment {
-						payment_preimage: Some(payment_preimage), ..
-					}, ..
-				} => claim_payment($node, $path, payment_preimage),
-				_ => panic!(),
-			};
-		}
-	}
+fn claim_bolt12_payment<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, path: &[&Node<'a, 'b, 'c>]) {
+	let recipient = &path[path.len() - 1];
+	match get_event!(recipient, Event::PaymentClaimable) {
+		Event::PaymentClaimable {
+			purpose: PaymentPurpose::InvoicePayment {
+				payment_preimage: Some(payment_preimage), ..
+			}, ..
+		} => claim_payment(node, path, payment_preimage),
+		_ => panic!(),
+	};
 }
 
 fn extract_invoice_request<'a, 'b, 'c>(
@@ -157,10 +151,10 @@ fn creates_and_pays_for_offer_using_blinded_paths() {
 		assert_eq!(path.introduction_node_id, alice_id);
 	}
 
-	route_payment!(bob, &[alice], invoice);
+	route_bolt12_payment(bob, &[alice], &invoice);
 	expect_recent_payment!(bob, RecentPaymentDetails::Pending, payment_id);
 
-	claim_payment!(bob, &[alice]);
+	claim_bolt12_payment(bob, &[alice]);
 	expect_recent_payment!(bob, RecentPaymentDetails::Fulfilled, payment_id);
 }
 
@@ -211,9 +205,9 @@ fn creates_and_pays_for_refund_using_blinded_paths() {
 		assert_eq!(path.introduction_node_id, alice_id);
 	}
 
-	route_payment!(bob, &[alice], invoice);
+	route_bolt12_payment(bob, &[alice], &invoice);
 	expect_recent_payment!(bob, RecentPaymentDetails::Pending, payment_id);
 
-	claim_payment!(bob, &[alice]);
+	claim_bolt12_payment(bob, &[alice]);
 	expect_recent_payment!(bob, RecentPaymentDetails::Fulfilled, payment_id);
 }