Dangle class types from field accessor getters.

Author: arik-so

bindings/LDK/options/APIError.swift

@@ -230,7 +230,7 @@ APIError_clone(origPointer)
 
 
 					public func getScript() -> ShutdownScript {
-						return ShutdownScript(pointer: self.cOpaqueStruct!.script)
+						return ShutdownScript(pointer: self.cOpaqueStruct!.script).dangle()
 					}
 
 

bindings/LDK/options/ErrorAction.swift

@@ -126,7 +126,7 @@ ErrorAction_clone(origPointer)
 
 
 					public func getMsg() -> ErrorMessage {
-						return ErrorMessage(pointer: self.cOpaqueStruct!.msg)
+						return ErrorMessage(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -144,7 +144,7 @@ ErrorAction_clone(origPointer)
 
 
 					public func getMsg() -> ErrorMessage {
-						return ErrorMessage(pointer: self.cOpaqueStruct!.msg)
+						return ErrorMessage(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 

bindings/LDK/options/Event.swift

@@ -232,7 +232,7 @@ Event_write(objPointer)
 					}
 
 					public func getPurpose() -> PaymentPurpose {
-						return PaymentPurpose(pointer: self.cOpaqueStruct!.purpose)
+						return PaymentPurpose(pointer: self.cOpaqueStruct!.purpose).dangle()
 					}
 
 
@@ -326,7 +326,7 @@ Event_write(objPointer)
 
 
 					public func getFee_earned_msat() -> Option_u64Z {
-						return Option_u64Z(pointer: self.cOpaqueStruct!.fee_earned_msat)
+						return Option_u64Z(pointer: self.cOpaqueStruct!.fee_earned_msat).dangle()
 					}
 
 					public func getClaim_from_onchain_tx() -> Bool {

bindings/LDK/options/HTLCFailChannelUpdate.swift

@@ -121,7 +121,7 @@ HTLCFailChannelUpdate_clone(origPointer)
 
 
 					public func getMsg() -> ChannelUpdate {
-						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
+						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 

bindings/LDK/options/MessageSendEvent.swift

@@ -363,7 +363,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> AcceptChannel {
-						return AcceptChannel(pointer: self.cOpaqueStruct!.msg)
+						return AcceptChannel(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -385,7 +385,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> OpenChannel {
-						return OpenChannel(pointer: self.cOpaqueStruct!.msg)
+						return OpenChannel(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -407,7 +407,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> FundingCreated {
-						return FundingCreated(pointer: self.cOpaqueStruct!.msg)
+						return FundingCreated(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -429,7 +429,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> FundingSigned {
-						return FundingSigned(pointer: self.cOpaqueStruct!.msg)
+						return FundingSigned(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -451,7 +451,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> FundingLocked {
-						return FundingLocked(pointer: self.cOpaqueStruct!.msg)
+						return FundingLocked(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -473,7 +473,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> AnnouncementSignatures {
-						return AnnouncementSignatures(pointer: self.cOpaqueStruct!.msg)
+						return AnnouncementSignatures(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -495,7 +495,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getUpdates() -> CommitmentUpdate {
-						return CommitmentUpdate(pointer: self.cOpaqueStruct!.updates)
+						return CommitmentUpdate(pointer: self.cOpaqueStruct!.updates).dangle()
 					}
 
 
@@ -517,7 +517,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> RevokeAndACK {
-						return RevokeAndACK(pointer: self.cOpaqueStruct!.msg)
+						return RevokeAndACK(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -539,7 +539,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> ClosingSigned {
-						return ClosingSigned(pointer: self.cOpaqueStruct!.msg)
+						return ClosingSigned(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -561,7 +561,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> Shutdown {
-						return Shutdown(pointer: self.cOpaqueStruct!.msg)
+						return Shutdown(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -583,7 +583,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> ChannelReestablish {
-						return ChannelReestablish(pointer: self.cOpaqueStruct!.msg)
+						return ChannelReestablish(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -601,11 +601,11 @@ MessageSendEvent_clone(origPointer)
 
 
 					public func getMsg() -> ChannelAnnouncement {
-						return ChannelAnnouncement(pointer: self.cOpaqueStruct!.msg)
+						return ChannelAnnouncement(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 					public func getUpdate_msg() -> ChannelUpdate {
-						return ChannelUpdate(pointer: self.cOpaqueStruct!.update_msg)
+						return ChannelUpdate(pointer: self.cOpaqueStruct!.update_msg).dangle()
 					}
 
 
@@ -623,7 +623,7 @@ MessageSendEvent_clone(origPointer)
 
 
 					public func getMsg() -> NodeAnnouncement {
-						return NodeAnnouncement(pointer: self.cOpaqueStruct!.msg)
+						return NodeAnnouncement(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -641,7 +641,7 @@ MessageSendEvent_clone(origPointer)
 
 
 					public func getMsg() -> ChannelUpdate {
-						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
+						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -663,7 +663,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> ChannelUpdate {
-						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
+						return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -685,7 +685,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getAction() -> ErrorAction {
-						return ErrorAction(pointer: self.cOpaqueStruct!.action)
+						return ErrorAction(pointer: self.cOpaqueStruct!.action).dangle()
 					}
 
 
@@ -703,7 +703,7 @@ MessageSendEvent_clone(origPointer)
 
 
 					public func getUpdate() -> HTLCFailChannelUpdate {
-						return HTLCFailChannelUpdate(pointer: self.cOpaqueStruct!.update)
+						return HTLCFailChannelUpdate(pointer: self.cOpaqueStruct!.update).dangle()
 					}
 
 
@@ -725,7 +725,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> QueryChannelRange {
-						return QueryChannelRange(pointer: self.cOpaqueStruct!.msg)
+						return QueryChannelRange(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -747,7 +747,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> QueryShortChannelIds {
-						return QueryShortChannelIds(pointer: self.cOpaqueStruct!.msg)
+						return QueryShortChannelIds(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 
@@ -769,7 +769,7 @@ MessageSendEvent_clone(origPointer)
 					}
 
 					public func getMsg() -> ReplyChannelRange {
-						return ReplyChannelRange(pointer: self.cOpaqueStruct!.msg)
+						return ReplyChannelRange(pointer: self.cOpaqueStruct!.msg).dangle()
 					}
 
 

bindings/LDK/options/MonitorEvent.swift

@@ -37,14 +37,14 @@ public class MonitorEvent: NativeTypeWrapper {
 						if self.cOpaqueStruct?.tag != LDKMonitorEvent_HTLCEvent {
 							return nil
 						}
-						return HTLCUpdate(pointer: self.cOpaqueStruct!.htlc_event)
+						return HTLCUpdate(pointer: self.cOpaqueStruct!.htlc_event).dangle()
 					}
 
 					public func getValueAsCommitmentTxBroadcasted() -> OutPoint? {
 						if self.cOpaqueStruct?.tag != LDKMonitorEvent_CommitmentTxBroadcasted {
 							return nil
 						}
-						return OutPoint(pointer: self.cOpaqueStruct!.commitment_tx_broadcasted)
+						return OutPoint(pointer: self.cOpaqueStruct!.commitment_tx_broadcasted).dangle()
 					}
 
 

bindings/LDK/options/PaymentSendFailure.swift

@@ -41,7 +41,7 @@ public class PaymentSendFailure: NativeTypeWrapper {
 						if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_ParameterError {
 							return nil
 						}
-						return APIError(pointer: self.cOpaqueStruct!.parameter_error)
+						return APIError(pointer: self.cOpaqueStruct!.parameter_error).dangle()
 					}
 
 					public func getValueAsPathParameterError() -> [LDKCResult_NoneAPIErrorZ]? {

bindings/LDK/options/SpendableOutputDescriptor.swift

@@ -46,14 +46,14 @@ public class SpendableOutputDescriptor: NativeTypeWrapper {
 						if self.cOpaqueStruct?.tag != LDKSpendableOutputDescriptor_DelayedPaymentOutput {
 							return nil
 						}
-						return DelayedPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.delayed_payment_output)
+						return DelayedPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.delayed_payment_output).dangle()
 					}
 
 					public func getValueAsStaticPaymentOutput() -> StaticPaymentOutputDescriptor? {
 						if self.cOpaqueStruct?.tag != LDKSpendableOutputDescriptor_StaticPaymentOutput {
 							return nil
 						}
-						return StaticPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.static_payment_output)
+						return StaticPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.static_payment_output).dangle()
 					}
 
 
@@ -138,11 +138,11 @@ SpendableOutputDescriptor_write(objPointer)
 
 
 					public func getOutpoint() -> OutPoint {
-						return OutPoint(pointer: self.cOpaqueStruct!.outpoint)
+						return OutPoint(pointer: self.cOpaqueStruct!.outpoint).dangle()
 					}
 
 					public func getOutput() -> TxOut {
-						return TxOut(pointer: self.cOpaqueStruct!.output)
+						return TxOut(pointer: self.cOpaqueStruct!.output).dangle()
 					}
 
 

src/conversion_helper.py

@@ -332,9 +332,13 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
 			if is_trait_instantiator:
 				# replace if with elif if it's only to be used for _as methods (ChannelManagerReadArgs with get_ vs KeysManager with as_)
 				return_suffix = return_suffix.rstrip(')') + ', anchor: self)'
+			if is_raw_property_getter:
+				return_suffix += '.dangle()'
 		elif rust_return_type == 'LDKC' + return_type_string and not is_clone_method:
 			return_prefix = f'{swift_return_instantiation_type}(pointer: '
 			return_suffix = ')'
+			if is_raw_property_getter:
+				return_suffix += '.dangle()'
 		# if is_trait_instantiator:
 		# only applies to tuples, but is never hit
 		# return_suffix = ', anchor: self)'