f Account for new PaymentKind variants and offer_id

Author: tnull

tests/integration_tests_rust.rs

@@ -411,9 +411,10 @@ fn simple_bolt12_send_receive() {
 	let node_a_payments = node_a.list_payments();
 	assert_eq!(node_a_payments.len(), 1);
 	match node_a_payments.first().unwrap().kind {
-		PaymentKind::Bolt12 { hash, preimage, secret: _ } => {
+		PaymentKind::Bolt12Offer { hash, preimage, secret: _, offer_id } => {
 			assert!(hash.is_some());
 			assert!(preimage.is_some());
+			assert_eq!(offer_id, offer.id());
 			//TODO: We should eventually set and assert the secret sender-side, too, but the BOLT12
 			//API currently doesn't allow to do that.
 		},
@@ -426,10 +427,11 @@ fn simple_bolt12_send_receive() {
 	let node_b_payments = node_b.list_payments();
 	assert_eq!(node_b_payments.len(), 1);
 	match node_b_payments.first().unwrap().kind {
-		PaymentKind::Bolt12 { hash, preimage, secret } => {
+		PaymentKind::Bolt12Offer { hash, preimage, secret, offer_id } => {
 			assert!(hash.is_some());
 			assert!(preimage.is_some());
 			assert!(secret.is_some());
+			assert_eq!(offer_id, offer.id());
 		},
 		_ => {
 			panic!("Unexpected payment kind");