Merge pull request #48 from lightningdevkit/tuple_accessors

arik-so · web-flow · commit 0641db75dde1 · 2022-06-24T11:42:44.000-04:00
Add accessors for fields inside tuples.
diff --git a/bindings/LDK/Bindings.swift b/bindings/LDK/Bindings.swift
@@ -6528,7 +6528,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
 	*/
 
 	public class func get_ldk_swift_bindings_version() -> String {
-        return "90b85905ad0889a5368bb8eee79bfbb4d0ff444e"
+        return "6298a024f0e5948b53400c15a56883474f8d6a10"
     }
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_BlockHashChannelManagerZ.swift b/bindings/LDK/tuples/C2Tuple_BlockHashChannelManagerZ.swift
@@ -39,7 +39,7 @@ public class func new(a: [UInt8], b: ChannelManager) -> C2Tuple_BlockHashChannel
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_BlockHashChannelManagerZ \(self.instanceNumber).")
@@ -50,6 +50,14 @@ public class func new(a: [UInt8], b: ChannelManager) -> C2Tuple_BlockHashChannel
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> ChannelManager {
+					return ChannelManager(pointer: self.cOpaqueStruct!.b, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_BlockHashChannelMonitorZ.swift b/bindings/LDK/tuples/C2Tuple_BlockHashChannelMonitorZ.swift
@@ -51,7 +51,7 @@ C2Tuple_BlockHashChannelMonitorZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_BlockHashChannelMonitorZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_BlockHashChannelMonitorZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> ChannelMonitor {
+					return ChannelMonitor(pointer: self.cOpaqueStruct!.b, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_OutPointScriptZ.swift b/bindings/LDK/tuples/C2Tuple_OutPointScriptZ.swift
@@ -56,7 +56,7 @@ C2Tuple_OutPointScriptZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_OutPointScriptZ \(self.instanceNumber).")
@@ -67,6 +67,23 @@ C2Tuple_OutPointScriptZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> OutPoint? {
+					return 
+				{ () in
+					let cStruct =
+				self.cOpaqueStruct!.a;
+				if cStruct.inner == nil {
+					return nil
+				}
+				return OutPoint(pointer: cStruct, anchor: self)
+				}()
+			;
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKCVec_u8Z_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_PaymentHashPaymentIdZ.swift b/bindings/LDK/tuples/C2Tuple_PaymentHashPaymentIdZ.swift
@@ -51,7 +51,7 @@ C2Tuple_PaymentHashPaymentIdZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_PaymentHashPaymentIdZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_PaymentHashPaymentIdZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.b);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_PaymentHashPaymentSecretZ.swift b/bindings/LDK/tuples/C2Tuple_PaymentHashPaymentSecretZ.swift
@@ -51,7 +51,7 @@ C2Tuple_PaymentHashPaymentSecretZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_PaymentHashPaymentSecretZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_PaymentHashPaymentSecretZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.b);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_PublicKeyTypeZ.swift b/bindings/LDK/tuples/C2Tuple_PublicKeyTypeZ.swift
@@ -51,7 +51,7 @@ C2Tuple_PublicKeyTypeZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_PublicKeyTypeZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_PublicKeyTypeZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKPublicKey_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> BindingsType {
+					return BindingsType(pointer: self.cOpaqueStruct!.b, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_SignatureCVec_SignatureZZ.swift b/bindings/LDK/tuples/C2Tuple_SignatureCVec_SignatureZZ.swift
@@ -56,7 +56,7 @@ C2Tuple_SignatureCVec_SignatureZZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_SignatureCVec_SignatureZZ \(self.instanceNumber).")
@@ -67,6 +67,14 @@ C2Tuple_SignatureCVec_SignatureZZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKSignature_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [[UInt8]] {
+					return Bindings.LDKCVec_SignatureZ_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_SignatureSignatureZ.swift b/bindings/LDK/tuples/C2Tuple_SignatureSignatureZ.swift
@@ -51,7 +51,7 @@ C2Tuple_SignatureSignatureZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_SignatureSignatureZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_SignatureSignatureZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKSignature_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKSignature_to_array(nativeType: self.cOpaqueStruct!.b);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ.swift b/bindings/LDK/tuples/C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ.swift
@@ -61,7 +61,7 @@ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ \(self.instanceNumber).")
@@ -72,6 +72,19 @@ C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [C2Tuple_u32ScriptZ] {
+					return Bindings.LDKCVec_C2Tuple_u32ScriptZZ_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false)
+						
+						.map { (cOpaqueStruct) in
+							C2Tuple_u32ScriptZ(pointer: cOpaqueStruct).dangle()
+						}
+					;
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ.swift b/bindings/LDK/tuples/C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ.swift
@@ -61,7 +61,7 @@ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ \(self.instanceNumber).")
@@ -72,6 +72,19 @@ C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.a);
+				}
+			
+				public func getB() -> [C2Tuple_u32TxOutZ] {
+					return Bindings.LDKCVec_C2Tuple_u32TxOutZZ_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false)
+						
+						.map { (cOpaqueStruct) in
+							C2Tuple_u32TxOutZ(pointer: cOpaqueStruct).dangle()
+						}
+					;
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_u32ScriptZ.swift b/bindings/LDK/tuples/C2Tuple_u32ScriptZ.swift
@@ -56,7 +56,7 @@ C2Tuple_u32ScriptZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_u32ScriptZ \(self.instanceNumber).")
@@ -67,6 +67,14 @@ C2Tuple_u32ScriptZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> UInt32 {
+					return self.cOpaqueStruct!.a;
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKCVec_u8Z_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_u32TxOutZ.swift b/bindings/LDK/tuples/C2Tuple_u32TxOutZ.swift
@@ -51,7 +51,7 @@ C2Tuple_u32TxOutZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_u32TxOutZ \(self.instanceNumber).")
@@ -62,6 +62,14 @@ C2Tuple_u32TxOutZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> UInt32 {
+					return self.cOpaqueStruct!.a;
+				}
+			
+				public func getB() -> TxOut {
+					return TxOut(pointer: self.cOpaqueStruct!.b, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C2Tuple_usizeTransactionZ.swift b/bindings/LDK/tuples/C2Tuple_usizeTransactionZ.swift
@@ -56,7 +56,7 @@ C2Tuple_usizeTransactionZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C2Tuple_usizeTransactionZ \(self.instanceNumber).")
@@ -67,6 +67,14 @@ C2Tuple_usizeTransactionZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> UInt {
+					return self.cOpaqueStruct!.a;
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKTransaction_to_array(nativeType: self.cOpaqueStruct!.b, deallocate: false);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.swift b/bindings/LDK/tuples/C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ.swift
@@ -51,7 +51,7 @@ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ \(self.instanceNumber).")
@@ -62,6 +62,18 @@ C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> ChannelAnnouncement {
+					return ChannelAnnouncement(pointer: self.cOpaqueStruct!.a, anchor: self);
+				}
+			
+				public func getB() -> ChannelUpdate {
+					return ChannelUpdate(pointer: self.cOpaqueStruct!.b, anchor: self);
+				}
+			
+				public func getC() -> ChannelUpdate {
+					return ChannelUpdate(pointer: self.cOpaqueStruct!.c, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/LDK/tuples/C3Tuple_RawInvoice_u832InvoiceSignatureZ.swift b/bindings/LDK/tuples/C3Tuple_RawInvoice_u832InvoiceSignatureZ.swift
@@ -51,7 +51,7 @@ C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(origPointer)
         				self.dangling = true
 						return self
 					}
-					
+
 					deinit {
 						if !self.dangling {
 							Bindings.print("Freeing C3Tuple_RawInvoice_u832InvoiceSignatureZ \(self.instanceNumber).")
@@ -62,6 +62,18 @@ C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(origPointer)
 					}
 				
 
+				public func getA() -> RawInvoice {
+					return RawInvoice(pointer: self.cOpaqueStruct!.a, anchor: self);
+				}
+			
+				public func getB() -> [UInt8] {
+					return Bindings.LDKThirtyTwoBytes_to_array(nativeType: self.cOpaqueStruct!.b);
+				}
+			
+				public func getC() -> InvoiceSignature {
+					return InvoiceSignature(pointer: self.cOpaqueStruct!.c, anchor: self);
+				}
+			
     /* TUPLE_METHODS_END */
 
 }
diff --git a/bindings/batteries/ChannelManagerConstructor.swift b/bindings/batteries/ChannelManagerConstructor.swift
diff --git a/src/generators/tuple_generator.py b/src/generators/tuple_generator.py

Original file line number	Diff line number	Diff line change
`@@ -6528,7 +6528,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra`
`6528`	`6528`	`*/`
`6529`	`6529`
`6530`	`6530`	`public class func get_ldk_swift_bindings_version() -> String {`
`6531`		`- return "90b85905ad0889a5368bb8eee79bfbb4d0ff444e"`
	`6531`	`+ return "6298a024f0e5948b53400c15a56883474f8d6a10"`
`6532`	`6532`	`}`
`6533`	`6533`
`6534`	`6534`	`}`