X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMonitorEvent.java;h=cb641761a580549e8254d8739299224db1cd7c3f;hb=d8656f7b597edd7ae8c34cb677c35d3b1635efd5;hp=dec1118f8ca22ea937e9ba3a2b275f462ad1c52b;hpb=0de4267b2f4dd9a0b2b2dfab7efc788887894a33;p=ldk-java diff --git a/src/main/java/org/ldk/structs/MonitorEvent.java b/src/main/java/org/ldk/structs/MonitorEvent.java index dec1118f..cb641761 100644 --- a/src/main/java/org/ldk/structs/MonitorEvent.java +++ b/src/main/java/org/ldk/structs/MonitorEvent.java @@ -24,15 +24,12 @@ public class MonitorEvent extends CommonBase { if (raw_val.getClass() == bindings.LDKMonitorEvent.HTLCEvent.class) { return new HTLCEvent(ptr, (bindings.LDKMonitorEvent.HTLCEvent)raw_val); } - if (raw_val.getClass() == bindings.LDKMonitorEvent.CommitmentTxConfirmed.class) { - return new CommitmentTxConfirmed(ptr, (bindings.LDKMonitorEvent.CommitmentTxConfirmed)raw_val); + if (raw_val.getClass() == bindings.LDKMonitorEvent.HolderForceClosed.class) { + return new HolderForceClosed(ptr, (bindings.LDKMonitorEvent.HolderForceClosed)raw_val); } if (raw_val.getClass() == bindings.LDKMonitorEvent.Completed.class) { return new Completed(ptr, (bindings.LDKMonitorEvent.Completed)raw_val); } - if (raw_val.getClass() == bindings.LDKMonitorEvent.UpdateFailed.class) { - return new UpdateFailed(ptr, (bindings.LDKMonitorEvent.UpdateFailed)raw_val); - } assert false; return null; // Unreachable without extending the (internal) bindings interface } @@ -52,14 +49,14 @@ public class MonitorEvent extends CommonBase { /** * A monitor event that the Channel's commitment transaction was confirmed. */ - public final static class CommitmentTxConfirmed extends MonitorEvent { - public final org.ldk.structs.OutPoint commitment_tx_confirmed; - private CommitmentTxConfirmed(long ptr, bindings.LDKMonitorEvent.CommitmentTxConfirmed obj) { + public final static class HolderForceClosed extends MonitorEvent { + public final org.ldk.structs.OutPoint holder_force_closed; + private HolderForceClosed(long ptr, bindings.LDKMonitorEvent.HolderForceClosed obj) { super(null, ptr); - long commitment_tx_confirmed = obj.commitment_tx_confirmed; - org.ldk.structs.OutPoint commitment_tx_confirmed_hu_conv = null; if (commitment_tx_confirmed < 0 || commitment_tx_confirmed > 4096) { commitment_tx_confirmed_hu_conv = new org.ldk.structs.OutPoint(null, commitment_tx_confirmed); } - if (commitment_tx_confirmed_hu_conv != null) { commitment_tx_confirmed_hu_conv.ptrs_to.add(this); }; - this.commitment_tx_confirmed = commitment_tx_confirmed_hu_conv; + long holder_force_closed = obj.holder_force_closed; + org.ldk.structs.OutPoint holder_force_closed_hu_conv = null; if (holder_force_closed < 0 || holder_force_closed > 4096) { holder_force_closed_hu_conv = new org.ldk.structs.OutPoint(null, holder_force_closed); } + if (holder_force_closed_hu_conv != null) { holder_force_closed_hu_conv.ptrs_to.add(this); }; + this.holder_force_closed = holder_force_closed_hu_conv; } } /** @@ -90,22 +87,6 @@ public class MonitorEvent extends CommonBase { this.monitor_update_id = obj.monitor_update_id; } } - /** - * Indicates a [`ChannelMonitor`] update has failed. See - * [`ChannelMonitorUpdateStatus::PermanentFailure`] for more information on how this is used. - * - * [`ChannelMonitorUpdateStatus::PermanentFailure`]: super::ChannelMonitorUpdateStatus::PermanentFailure - */ - public final static class UpdateFailed extends MonitorEvent { - public final org.ldk.structs.OutPoint update_failed; - private UpdateFailed(long ptr, bindings.LDKMonitorEvent.UpdateFailed obj) { - super(null, ptr); - long update_failed = obj.update_failed; - org.ldk.structs.OutPoint update_failed_hu_conv = null; if (update_failed < 0 || update_failed > 4096) { update_failed_hu_conv = new org.ldk.structs.OutPoint(null, update_failed); } - if (update_failed_hu_conv != null) { update_failed_hu_conv.ptrs_to.add(this); }; - this.update_failed = update_failed_hu_conv; - } - } long clone_ptr() { long ret = bindings.MonitorEvent_clone_ptr(this.ptr); Reference.reachabilityFence(this); @@ -127,7 +108,7 @@ public class MonitorEvent extends CommonBase { /** * Utility method to constructs a new HTLCEvent-variant MonitorEvent */ - public static MonitorEvent htlcevent(HTLCUpdate a) { + public static MonitorEvent htlcevent(org.ldk.structs.HTLCUpdate a) { long ret = bindings.MonitorEvent_htlcevent(a == null ? 0 : a.ptr); Reference.reachabilityFence(a); if (ret >= 0 && ret <= 4096) { return null; } @@ -138,10 +119,10 @@ public class MonitorEvent extends CommonBase { } /** - * Utility method to constructs a new CommitmentTxConfirmed-variant MonitorEvent + * Utility method to constructs a new HolderForceClosed-variant MonitorEvent */ - public static MonitorEvent commitment_tx_confirmed(OutPoint a) { - long ret = bindings.MonitorEvent_commitment_tx_confirmed(a == null ? 0 : a.ptr); + public static MonitorEvent holder_force_closed(org.ldk.structs.OutPoint a) { + long ret = bindings.MonitorEvent_holder_force_closed(a == null ? 0 : a.ptr); Reference.reachabilityFence(a); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret); @@ -153,7 +134,7 @@ public class MonitorEvent extends CommonBase { /** * Utility method to constructs a new Completed-variant MonitorEvent */ - public static MonitorEvent completed(OutPoint funding_txo, long monitor_update_id) { + public static MonitorEvent completed(org.ldk.structs.OutPoint funding_txo, long monitor_update_id) { long ret = bindings.MonitorEvent_completed(funding_txo == null ? 0 : funding_txo.ptr, monitor_update_id); Reference.reachabilityFence(funding_txo); Reference.reachabilityFence(monitor_update_id); @@ -164,24 +145,11 @@ public class MonitorEvent extends CommonBase { return ret_hu_conv; } - /** - * Utility method to constructs a new UpdateFailed-variant MonitorEvent - */ - public static MonitorEvent update_failed(OutPoint a) { - long ret = bindings.MonitorEvent_update_failed(a == null ? 0 : a.ptr); - Reference.reachabilityFence(a); - if (ret >= 0 && ret <= 4096) { return null; } - org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret); - if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); }; - if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(a); }; - return ret_hu_conv; - } - /** * Checks if two MonitorEvents contain equal inner contents. * This ignores pointers and is_owned flags and looks at the values in fields. */ - public boolean eq(MonitorEvent b) { + public boolean eq(org.ldk.structs.MonitorEvent b) { boolean ret = bindings.MonitorEvent_eq(this.ptr, b == null ? 0 : b.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(b);