xpay: forward command notifications from askrene.

This gives us more route details (particularly at higher log levels).

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

plugins/xpay/xpay.c

@@ -1348,10 +1348,11 @@ static struct command_result *getroutes_for(struct command *aux_cmd,
 		maxfee = AMOUNT_MSAT(0);
 	}
 
-	req = jsonrpc_request_start(aux_cmd, "getroutes",
-				    getroutes_done,
-				    getroutes_done_err,
-				    payment);
+	req = jsonrpc_request_notified_start(aux_cmd, "getroutes",
+					     getroutes_done,
+					     getroutes_done_err,
+					     forward_notified,
+					     payment);
 
 	json_add_pubkey(req->js, "source", &xpay->local_id);
 	json_add_pubkey(req->js, "destination", dst);

tests/test_askrene.py

@@ -1536,3 +1536,20 @@ def test_simple_dummy_channel(node_factory):
         final_cltv=5,
         layers=["mylayer"],
     )
+
+
+def test_askrene_notifications(node_factory):
+    l1, l2, l3 = node_factory.line_graph(3, wait_for_announce=True)
+
+    out = subprocess.check_output(['cli/lightning-cli',
+                                   '--network={}'.format(TEST_NETWORK),
+                                   '--lightning-dir={}'
+                                   .format(l1.daemon.lightning_dir),
+                                   'getroutes',
+                                   l1.info['id'],
+                                   l3.info['id'],
+                                   "10000msat",
+                                   "[]",
+                                   "1000msat",
+                                   "11"]).decode('utf-8').splitlines()
+    assert out == []

tests/test_xpay.py

@@ -1036,3 +1036,41 @@ def test_xpay_bip353(node_factory):
     # Now with a payer_note:
     l2.rpc.xpay(invstring='[email protected]', amount_msat=123, payer_note="Eat at Joes!")
     assert l1.rpc.decode(l1.rpc.listinvoices()['invoices'][1]['bolt12'])['invreq_payer_note'] == "Eat at Joes!"
+
+
+def test_xpay_forward_askrene_notifications(node_factory):
+    l1, l2, l3 = node_factory.line_graph(3, wait_for_announce=True)
+
+    scid12 = first_scid(l1, l2)
+    scid23 = first_scid(l3, l2)
+    offer = l3.rpc.offer("1000sat", 'test_xpay_forward_askrene_notifications')['bolt12']
+    out = subprocess.check_output(['cli/lightning-cli',
+                                   '--network={}'.format(TEST_NETWORK),
+                                   '--lightning-dir={}'
+                                   .format(l1.daemon.lightning_dir),
+                                   'xpay',
+                                   offer]).decode('utf-8').splitlines()
+    preimage = only_one(l3.rpc.listinvoices()['invoices'])['payment_preimage']
+    assert out == ['# Fetching invoice for offer',
+                   f'# getroutes: Flow 0/1: 1000011msat/11 {scid12}/1 -> 1000011msat/11 {scid23}/0 -> 1000000msat/5 0x0x0/1 -> 1000000msat/0',
+                   f'# ->{l2.info["id"]}->{l3.info["id"]}->020000000000000000000000000000000000000000000000000000000000000001: Success: preimage={preimage}',
+                   '{',
+                   f'   "payment_preimage": "{preimage}",',
+                   '   "amount_msat": 1000000,',
+                   '   "amount_sent_msat": 1000011,',
+                   '   "failed_parts": 0,',
+                   '   "successful_parts": 1',
+                   '}']
+
+    out2 = subprocess.check_output(['cli/lightning-cli',
+                                    '--network={}'.format(TEST_NETWORK),
+                                    # Now with debugging level notifications
+                                    '--notifications=debug',
+                                    '--lightning-dir={}'
+                                    .format(l1.daemon.lightning_dir),
+                                    'xpay',
+                                    offer]).decode('utf-8').splitlines()
+    assert out2[:3] == ['# Fetching invoice for offer',
+                        f'# offer is {offer}',
+                        f'# Invoice gave route {l3.info["id"]}->020000000000000000000000000000000000000000000000000000000000000001 (0x0x0/1)']
+    assert len(out2) > len(out)