rename kind to type_num, use proper tlv nums

Author: Evanfeenstra

bindings/ldk_node.udl

@@ -366,7 +366,7 @@ dictionary SendingParameters {
 };
 
 dictionary CustomTlvRecord {
-	u64 kind;
+	u64 type_num;
 	sequence<u8> value;
 };
 

src/event.rs

@@ -253,7 +253,7 @@ impl_writeable_tlv_based_enum!(Event,
 		(2, payment_id, required),
 		(4, claimable_amount_msat, required),
 		(6, claim_deadline, option),
-		(8, custom_records, optional_vec),
+		(7, custom_records, optional_vec),
 	},
 	(7, PaymentForwarded) => {
 		(0, prev_channel_id, required),

src/payment/spontaneous.rs

@@ -114,7 +114,7 @@ impl SpontaneousPayment {
 
 		let recipient_fields = match custom_tlvs {
 			Some(tlvs) => RecipientOnionFields::spontaneous_empty()
-				.with_custom_tlvs(tlvs.into_iter().map(|tlv| (tlv.kind, tlv.value)).collect())
+				.with_custom_tlvs(tlvs.into_iter().map(|tlv| (tlv.type_num, tlv.value)).collect())
 				.map_err(|e| {
 					log_error!(self.logger, "Failed to send payment with custom TLVs: {:?}", e);
 					Error::InvalidCustomTlvs

src/types.rs

@@ -354,18 +354,18 @@ pub struct PeerDetails {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CustomTlvRecord {
 	/// Type number.
-	pub kind: u64,
+	pub type_num: u64,
 	/// Serialized value.
 	pub value: Vec<u8>,
 }
 
 impl_writeable_tlv_based!(CustomTlvRecord, {
-	(0, kind, required),
-	(1, value, required),
+	(0, type_num, required),
+	(2, value, required),
 });
 
 impl From<&(u64, Vec<u8>)> for CustomTlvRecord {
 	fn from(tlv: &(u64, Vec<u8>)) -> Self {
-		CustomTlvRecord { kind: tlv.0, value: tlv.1.clone() }
+		CustomTlvRecord { type_num: tlv.0, value: tlv.1.clone() }
 	}
 }

tests/common/mod.rs

@@ -754,7 +754,7 @@ pub(crate) fn do_channel_full_cycle<E: ElectrumApi>(
 	// Test spontaneous/keysend payments
 	println!("\nA send_spontaneous_payment");
 	let keysend_amount_msat = 2500_000;
-	let custom_tlvs = vec![CustomTlvRecord { kind: 13377331, value: vec![1, 2, 3] }];
+	let custom_tlvs = vec![CustomTlvRecord { type_num: 13377331, value: vec![1, 2, 3] }];
 	let keysend_payment_id = node_a
 		.spontaneous_payment()
 		.send_with_custom_tlvs(keysend_amount_msat, node_b.node_id(), None, custom_tlvs.clone())