X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FMonitorEvent.java;h=cb641761a580549e8254d8739299224db1cd7c3f;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=0beb6f645b31c92cf313175e81fde6afe123e8cd;hpb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/MonitorEvent.java b/src/main/java/org/ldk/structs/MonitorEvent.java
index 0beb6f64..cb641761 100644
--- a/src/main/java/org/ldk/structs/MonitorEvent.java
+++ b/src/main/java/org/ldk/structs/MonitorEvent.java
@@ -24,14 +24,11 @@ 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.UpdateCompleted.class) {
-			return new UpdateCompleted(ptr, (bindings.LDKMonitorEvent.UpdateCompleted)raw_val);
-		}
-		if (raw_val.getClass() == bindings.LDKMonitorEvent.UpdateFailed.class) {
-			return new UpdateFailed(ptr, (bindings.LDKMonitorEvent.UpdateFailed)raw_val);
+		if (raw_val.getClass() == bindings.LDKMonitorEvent.Completed.class) {
+			return new Completed(ptr, (bindings.LDKMonitorEvent.Completed)raw_val);
 		}
 		assert false; return null; // Unreachable without extending the (internal) bindings interface
 	}
@@ -44,31 +41,31 @@ public class MonitorEvent extends CommonBase {
 		private HTLCEvent(long ptr, bindings.LDKMonitorEvent.HTLCEvent obj) {
 			super(null, ptr);
 			long htlc_event = obj.htlc_event;
-			HTLCUpdate htlc_event_hu_conv = null; if (htlc_event < 0 || htlc_event > 4096) { htlc_event_hu_conv = new HTLCUpdate(null, htlc_event); }
-			htlc_event_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.HTLCUpdate htlc_event_hu_conv = null; if (htlc_event < 0 || htlc_event > 4096) { htlc_event_hu_conv = new org.ldk.structs.HTLCUpdate(null, htlc_event); }
+			if (htlc_event_hu_conv != null) { htlc_event_hu_conv.ptrs_to.add(this); };
 			this.htlc_event = htlc_event_hu_conv;
 		}
 	}
 	/**
 	 * 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;
-			OutPoint commitment_tx_confirmed_hu_conv = null; if (commitment_tx_confirmed < 0 || commitment_tx_confirmed > 4096) { commitment_tx_confirmed_hu_conv = new OutPoint(null, commitment_tx_confirmed); }
-			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;
 		}
 	}
 	/**
 	 * Indicates a [`ChannelMonitor`] update has completed. See
-	 * [`ChannelMonitorUpdateErr::TemporaryFailure`] for more information on how this is used.
+	 * [`ChannelMonitorUpdateStatus::InProgress`] for more information on how this is used.
 	 * 
-	 * [`ChannelMonitorUpdateErr::TemporaryFailure`]: super::ChannelMonitorUpdateErr::TemporaryFailure
+	 * [`ChannelMonitorUpdateStatus::InProgress`]: super::ChannelMonitorUpdateStatus::InProgress
 	 */
-	public final static class UpdateCompleted extends MonitorEvent {
+	public final static class Completed extends MonitorEvent {
 		/**
 		 * The funding outpoint of the [`ChannelMonitor`] that was updated
 		*/
@@ -81,31 +78,15 @@ public class MonitorEvent extends CommonBase {
 		 * same [`ChannelMonitor`] have been applied and persisted.
 		*/
 		public final long monitor_update_id;
-		private UpdateCompleted(long ptr, bindings.LDKMonitorEvent.UpdateCompleted obj) {
+		private Completed(long ptr, bindings.LDKMonitorEvent.Completed obj) {
 			super(null, ptr);
 			long funding_txo = obj.funding_txo;
-			OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new OutPoint(null, funding_txo); }
-			funding_txo_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.OutPoint funding_txo_hu_conv = null; if (funding_txo < 0 || funding_txo > 4096) { funding_txo_hu_conv = new org.ldk.structs.OutPoint(null, funding_txo); }
+			if (funding_txo_hu_conv != null) { funding_txo_hu_conv.ptrs_to.add(this); };
 			this.funding_txo = funding_txo_hu_conv;
 			this.monitor_update_id = obj.monitor_update_id;
 		}
 	}
-	/**
-	 * Indicates a [`ChannelMonitor`] update has failed. See
-	 * [`ChannelMonitorUpdateErr::PermanentFailure`] for more information on how this is used.
-	 * 
-	 * [`ChannelMonitorUpdateErr::PermanentFailure`]: super::ChannelMonitorUpdateErr::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;
-			OutPoint update_failed_hu_conv = null; if (update_failed < 0 || update_failed > 4096) { update_failed_hu_conv = new OutPoint(null, update_failed); }
-			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);
@@ -120,59 +101,65 @@ public class MonitorEvent extends CommonBase {
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Utility method to constructs a new HTLCEvent-variant MonitorEvent
 	 */
-	public static MonitorEvent htlcevent(HTLCUpdate a) {
-		long ret = bindings.MonitorEvent_htlcevent(a == null ? 0 : a.ptr & ~1);
+	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; }
 		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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;
 	}
 
 	/**
-	 * 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 & ~1);
+	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);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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;
 	}
 
 	/**
-	 * Utility method to constructs a new UpdateCompleted-variant MonitorEvent
+	 * Utility method to constructs a new Completed-variant MonitorEvent
 	 */
-	public static MonitorEvent update_completed(OutPoint funding_txo, long monitor_update_id) {
-		long ret = bindings.MonitorEvent_update_completed(funding_txo == null ? 0 : funding_txo.ptr & ~1, 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);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.MonitorEvent ret_hu_conv = org.ldk.structs.MonitorEvent.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		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(funding_txo); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Utility method to constructs a new UpdateFailed-variant MonitorEvent
+	 * Checks if two MonitorEvents contain equal inner contents.
+	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 */
-	public static MonitorEvent update_failed(OutPoint a) {
-		long ret = bindings.MonitorEvent_update_failed(a == null ? 0 : a.ptr & ~1);
-		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);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		return ret_hu_conv;
+	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);
+		return ret;
 	}
 
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof MonitorEvent)) return false;
+		return this.eq((MonitorEvent)o);
+	}
 	/**
 	 * Serialize the MonitorEvent object into a byte array which can be read by MonitorEvent_read
 	 */