Skip to content

Commit 0b31f2e

Browse files
committed
Dangle class types from field accessor getters.
1 parent 8f7afb2 commit 0b31f2e

9 files changed

+38
-34
lines changed

bindings/LDK/options/APIError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ APIError_clone(origPointer)
230230

231231

232232
public func getScript() -> ShutdownScript {
233-
return ShutdownScript(pointer: self.cOpaqueStruct!.script)
233+
return ShutdownScript(pointer: self.cOpaqueStruct!.script).dangle()
234234
}
235235

236236

bindings/LDK/options/ErrorAction.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ErrorAction_clone(origPointer)
126126

127127

128128
public func getMsg() -> ErrorMessage {
129-
return ErrorMessage(pointer: self.cOpaqueStruct!.msg)
129+
return ErrorMessage(pointer: self.cOpaqueStruct!.msg).dangle()
130130
}
131131

132132

@@ -144,7 +144,7 @@ ErrorAction_clone(origPointer)
144144

145145

146146
public func getMsg() -> ErrorMessage {
147-
return ErrorMessage(pointer: self.cOpaqueStruct!.msg)
147+
return ErrorMessage(pointer: self.cOpaqueStruct!.msg).dangle()
148148
}
149149

150150

bindings/LDK/options/Event.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Event_write(objPointer)
232232
}
233233

234234
public func getPurpose() -> PaymentPurpose {
235-
return PaymentPurpose(pointer: self.cOpaqueStruct!.purpose)
235+
return PaymentPurpose(pointer: self.cOpaqueStruct!.purpose).dangle()
236236
}
237237

238238

@@ -326,7 +326,7 @@ Event_write(objPointer)
326326

327327

328328
public func getFee_earned_msat() -> Option_u64Z {
329-
return Option_u64Z(pointer: self.cOpaqueStruct!.fee_earned_msat)
329+
return Option_u64Z(pointer: self.cOpaqueStruct!.fee_earned_msat).dangle()
330330
}
331331

332332
public func getClaim_from_onchain_tx() -> Bool {

bindings/LDK/options/HTLCFailChannelUpdate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ HTLCFailChannelUpdate_clone(origPointer)
121121

122122

123123
public func getMsg() -> ChannelUpdate {
124-
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
124+
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
125125
}
126126

127127

bindings/LDK/options/MessageSendEvent.swift

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ MessageSendEvent_clone(origPointer)
363363
}
364364

365365
public func getMsg() -> AcceptChannel {
366-
return AcceptChannel(pointer: self.cOpaqueStruct!.msg)
366+
return AcceptChannel(pointer: self.cOpaqueStruct!.msg).dangle()
367367
}
368368

369369

@@ -385,7 +385,7 @@ MessageSendEvent_clone(origPointer)
385385
}
386386

387387
public func getMsg() -> OpenChannel {
388-
return OpenChannel(pointer: self.cOpaqueStruct!.msg)
388+
return OpenChannel(pointer: self.cOpaqueStruct!.msg).dangle()
389389
}
390390

391391

@@ -407,7 +407,7 @@ MessageSendEvent_clone(origPointer)
407407
}
408408

409409
public func getMsg() -> FundingCreated {
410-
return FundingCreated(pointer: self.cOpaqueStruct!.msg)
410+
return FundingCreated(pointer: self.cOpaqueStruct!.msg).dangle()
411411
}
412412

413413

@@ -429,7 +429,7 @@ MessageSendEvent_clone(origPointer)
429429
}
430430

431431
public func getMsg() -> FundingSigned {
432-
return FundingSigned(pointer: self.cOpaqueStruct!.msg)
432+
return FundingSigned(pointer: self.cOpaqueStruct!.msg).dangle()
433433
}
434434

435435

@@ -451,7 +451,7 @@ MessageSendEvent_clone(origPointer)
451451
}
452452

453453
public func getMsg() -> FundingLocked {
454-
return FundingLocked(pointer: self.cOpaqueStruct!.msg)
454+
return FundingLocked(pointer: self.cOpaqueStruct!.msg).dangle()
455455
}
456456

457457

@@ -473,7 +473,7 @@ MessageSendEvent_clone(origPointer)
473473
}
474474

475475
public func getMsg() -> AnnouncementSignatures {
476-
return AnnouncementSignatures(pointer: self.cOpaqueStruct!.msg)
476+
return AnnouncementSignatures(pointer: self.cOpaqueStruct!.msg).dangle()
477477
}
478478

479479

@@ -495,7 +495,7 @@ MessageSendEvent_clone(origPointer)
495495
}
496496

497497
public func getUpdates() -> CommitmentUpdate {
498-
return CommitmentUpdate(pointer: self.cOpaqueStruct!.updates)
498+
return CommitmentUpdate(pointer: self.cOpaqueStruct!.updates).dangle()
499499
}
500500

501501

@@ -517,7 +517,7 @@ MessageSendEvent_clone(origPointer)
517517
}
518518

519519
public func getMsg() -> RevokeAndACK {
520-
return RevokeAndACK(pointer: self.cOpaqueStruct!.msg)
520+
return RevokeAndACK(pointer: self.cOpaqueStruct!.msg).dangle()
521521
}
522522

523523

@@ -539,7 +539,7 @@ MessageSendEvent_clone(origPointer)
539539
}
540540

541541
public func getMsg() -> ClosingSigned {
542-
return ClosingSigned(pointer: self.cOpaqueStruct!.msg)
542+
return ClosingSigned(pointer: self.cOpaqueStruct!.msg).dangle()
543543
}
544544

545545

@@ -561,7 +561,7 @@ MessageSendEvent_clone(origPointer)
561561
}
562562

563563
public func getMsg() -> Shutdown {
564-
return Shutdown(pointer: self.cOpaqueStruct!.msg)
564+
return Shutdown(pointer: self.cOpaqueStruct!.msg).dangle()
565565
}
566566

567567

@@ -583,7 +583,7 @@ MessageSendEvent_clone(origPointer)
583583
}
584584

585585
public func getMsg() -> ChannelReestablish {
586-
return ChannelReestablish(pointer: self.cOpaqueStruct!.msg)
586+
return ChannelReestablish(pointer: self.cOpaqueStruct!.msg).dangle()
587587
}
588588

589589

@@ -601,11 +601,11 @@ MessageSendEvent_clone(origPointer)
601601

602602

603603
public func getMsg() -> ChannelAnnouncement {
604-
return ChannelAnnouncement(pointer: self.cOpaqueStruct!.msg)
604+
return ChannelAnnouncement(pointer: self.cOpaqueStruct!.msg).dangle()
605605
}
606606

607607
public func getUpdate_msg() -> ChannelUpdate {
608-
return ChannelUpdate(pointer: self.cOpaqueStruct!.update_msg)
608+
return ChannelUpdate(pointer: self.cOpaqueStruct!.update_msg).dangle()
609609
}
610610

611611

@@ -623,7 +623,7 @@ MessageSendEvent_clone(origPointer)
623623

624624

625625
public func getMsg() -> NodeAnnouncement {
626-
return NodeAnnouncement(pointer: self.cOpaqueStruct!.msg)
626+
return NodeAnnouncement(pointer: self.cOpaqueStruct!.msg).dangle()
627627
}
628628

629629

@@ -641,7 +641,7 @@ MessageSendEvent_clone(origPointer)
641641

642642

643643
public func getMsg() -> ChannelUpdate {
644-
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
644+
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
645645
}
646646

647647

@@ -663,7 +663,7 @@ MessageSendEvent_clone(origPointer)
663663
}
664664

665665
public func getMsg() -> ChannelUpdate {
666-
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg)
666+
return ChannelUpdate(pointer: self.cOpaqueStruct!.msg).dangle()
667667
}
668668

669669

@@ -685,7 +685,7 @@ MessageSendEvent_clone(origPointer)
685685
}
686686

687687
public func getAction() -> ErrorAction {
688-
return ErrorAction(pointer: self.cOpaqueStruct!.action)
688+
return ErrorAction(pointer: self.cOpaqueStruct!.action).dangle()
689689
}
690690

691691

@@ -703,7 +703,7 @@ MessageSendEvent_clone(origPointer)
703703

704704

705705
public func getUpdate() -> HTLCFailChannelUpdate {
706-
return HTLCFailChannelUpdate(pointer: self.cOpaqueStruct!.update)
706+
return HTLCFailChannelUpdate(pointer: self.cOpaqueStruct!.update).dangle()
707707
}
708708

709709

@@ -725,7 +725,7 @@ MessageSendEvent_clone(origPointer)
725725
}
726726

727727
public func getMsg() -> QueryChannelRange {
728-
return QueryChannelRange(pointer: self.cOpaqueStruct!.msg)
728+
return QueryChannelRange(pointer: self.cOpaqueStruct!.msg).dangle()
729729
}
730730

731731

@@ -747,7 +747,7 @@ MessageSendEvent_clone(origPointer)
747747
}
748748

749749
public func getMsg() -> QueryShortChannelIds {
750-
return QueryShortChannelIds(pointer: self.cOpaqueStruct!.msg)
750+
return QueryShortChannelIds(pointer: self.cOpaqueStruct!.msg).dangle()
751751
}
752752

753753

@@ -769,7 +769,7 @@ MessageSendEvent_clone(origPointer)
769769
}
770770

771771
public func getMsg() -> ReplyChannelRange {
772-
return ReplyChannelRange(pointer: self.cOpaqueStruct!.msg)
772+
return ReplyChannelRange(pointer: self.cOpaqueStruct!.msg).dangle()
773773
}
774774

775775

bindings/LDK/options/MonitorEvent.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public class MonitorEvent: NativeTypeWrapper {
3737
if self.cOpaqueStruct?.tag != LDKMonitorEvent_HTLCEvent {
3838
return nil
3939
}
40-
return HTLCUpdate(pointer: self.cOpaqueStruct!.htlc_event)
40+
return HTLCUpdate(pointer: self.cOpaqueStruct!.htlc_event).dangle()
4141
}
4242

4343
public func getValueAsCommitmentTxBroadcasted() -> OutPoint? {
4444
if self.cOpaqueStruct?.tag != LDKMonitorEvent_CommitmentTxBroadcasted {
4545
return nil
4646
}
47-
return OutPoint(pointer: self.cOpaqueStruct!.commitment_tx_broadcasted)
47+
return OutPoint(pointer: self.cOpaqueStruct!.commitment_tx_broadcasted).dangle()
4848
}
4949

5050

bindings/LDK/options/PaymentSendFailure.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class PaymentSendFailure: NativeTypeWrapper {
4141
if self.cOpaqueStruct?.tag != LDKPaymentSendFailure_ParameterError {
4242
return nil
4343
}
44-
return APIError(pointer: self.cOpaqueStruct!.parameter_error)
44+
return APIError(pointer: self.cOpaqueStruct!.parameter_error).dangle()
4545
}
4646

4747
public func getValueAsPathParameterError() -> [LDKCResult_NoneAPIErrorZ]? {

bindings/LDK/options/SpendableOutputDescriptor.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public class SpendableOutputDescriptor: NativeTypeWrapper {
4646
if self.cOpaqueStruct?.tag != LDKSpendableOutputDescriptor_DelayedPaymentOutput {
4747
return nil
4848
}
49-
return DelayedPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.delayed_payment_output)
49+
return DelayedPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.delayed_payment_output).dangle()
5050
}
5151

5252
public func getValueAsStaticPaymentOutput() -> StaticPaymentOutputDescriptor? {
5353
if self.cOpaqueStruct?.tag != LDKSpendableOutputDescriptor_StaticPaymentOutput {
5454
return nil
5555
}
56-
return StaticPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.static_payment_output)
56+
return StaticPaymentOutputDescriptor(pointer: self.cOpaqueStruct!.static_payment_output).dangle()
5757
}
5858

5959

@@ -138,11 +138,11 @@ SpendableOutputDescriptor_write(objPointer)
138138

139139

140140
public func getOutpoint() -> OutPoint {
141-
return OutPoint(pointer: self.cOpaqueStruct!.outpoint)
141+
return OutPoint(pointer: self.cOpaqueStruct!.outpoint).dangle()
142142
}
143143

144144
public func getOutput() -> TxOut {
145-
return TxOut(pointer: self.cOpaqueStruct!.output)
145+
return TxOut(pointer: self.cOpaqueStruct!.output).dangle()
146146
}
147147

148148

src/conversion_helper.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,13 @@ def prepare_return_value(cls, return_type, is_clone_method=False, is_trait_insta
332332
if is_trait_instantiator:
333333
# replace if with elif if it's only to be used for _as methods (ChannelManagerReadArgs with get_ vs KeysManager with as_)
334334
return_suffix = return_suffix.rstrip(')') + ', anchor: self)'
335+
if is_raw_property_getter:
336+
return_suffix += '.dangle()'
335337
elif rust_return_type == 'LDKC' + return_type_string and not is_clone_method:
336338
return_prefix = f'{swift_return_instantiation_type}(pointer: '
337339
return_suffix = ')'
340+
if is_raw_property_getter:
341+
return_suffix += '.dangle()'
338342
# if is_trait_instantiator:
339343
# only applies to tuples, but is never hit
340344
# return_suffix = ', anchor: self)'

0 commit comments

Comments
 (0)