X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FPersist.java;h=5ce6a58051739e7cd1d213d42cf0b7a12feedfff;hb=8aa8a96fc6d8fcdd3fbb419b4b4c12482af14938;hp=416db9bd36eeaa91b61983f85c8018ee922c4c01;hpb=6d094e745feaf94c1059555cd1c997965a34bc36;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Persist.java b/src/main/java/org/ldk/structs/Persist.java
index 416db9bd..5ce6a580 100644
--- a/src/main/java/org/ldk/structs/Persist.java
+++ b/src/main/java/org/ldk/structs/Persist.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
 import javax.annotation.Nullable;
 
 /**
@@ -12,20 +13,21 @@ import javax.annotation.Nullable;
  * 
  * Each method can return three possible values:
  * If persistence (including any relevant `fsync()` calls) happens immediately, the
- * implementation should return `Ok(())`, indicating normal channel operation should continue.
+ * implementation should return [`ChannelMonitorUpdateStatus::Completed`], indicating normal
+ * channel operation should continue.
  * If persistence happens asynchronously, implementations should first ensure the
  * [`ChannelMonitor`] or [`ChannelMonitorUpdate`] are written durably to disk, and then return
- * `Err(ChannelMonitorUpdateErr::TemporaryFailure)` while the update continues in the
- * background. Once the update completes, [`ChainMonitor::channel_monitor_updated`] should be
- * called with the corresponding [`MonitorUpdateId`].
+ * [`ChannelMonitorUpdateStatus::InProgress`] while the update continues in the background.
+ * Once the update completes, [`ChainMonitor::channel_monitor_updated`] should be called with
+ * the corresponding [`MonitorUpdateId`].
  * 
  * Note that unlike the direct [`chain::Watch`] interface,
  * [`ChainMonitor::channel_monitor_updated`] must be called once for *each* update which occurs.
  * 
  * If persistence fails for some reason, implementations should return
- * `Err(ChannelMonitorUpdateErr::PermanentFailure)`, in which case the channel will likely be
+ * [`ChannelMonitorUpdateStatus::PermanentFailure`], in which case the channel will likely be
  * closed without broadcasting the latest state. See
- * [`ChannelMonitorUpdateErr::PermanentFailure`] for more details.
+ * [`ChannelMonitorUpdateStatus::PermanentFailure`] for more details.
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Persist extends CommonBase {
@@ -51,15 +53,15 @@ public class Persist extends CommonBase {
 		 * and the stored channel data). Note that you **must** persist every new monitor to disk.
 		 * 
 		 * The `update_id` is used to identify this call to [`ChainMonitor::channel_monitor_updated`],
-		 * if you return [`ChannelMonitorUpdateErr::TemporaryFailure`].
+		 * if you return [`ChannelMonitorUpdateStatus::InProgress`].
 		 * 
 		 * See [`Writeable::write`] on [`ChannelMonitor`] for writing out a `ChannelMonitor`
-		 * and [`ChannelMonitorUpdateErr`] for requirements when returning errors.
+		 * and [`ChannelMonitorUpdateStatus`] for requirements when returning errors.
 		 * 
 		 * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 		 * [`Writeable::write`]: crate::util::ser::Writeable::write
 		 */
-		Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint channel_id, ChannelMonitor data, MonitorUpdateId update_id);
+		ChannelMonitorUpdateStatus persist_new_channel(OutPoint channel_id, ChannelMonitor data, MonitorUpdateId update_id);
 		/**
 		 * Update one channel's data. The provided [`ChannelMonitor`] has already applied the given
 		 * update.
@@ -87,42 +89,42 @@ public class Persist extends CommonBase {
 		 * whereas updates are small and `O(1)`.
 		 * 
 		 * The `update_id` is used to identify this call to [`ChainMonitor::channel_monitor_updated`],
-		 * if you return [`ChannelMonitorUpdateErr::TemporaryFailure`].
+		 * if you return [`ChannelMonitorUpdateStatus::InProgress`].
 		 * 
 		 * See [`Writeable::write`] on [`ChannelMonitor`] for writing out a `ChannelMonitor`,
 		 * [`Writeable::write`] on [`ChannelMonitorUpdate`] for writing out an update, and
-		 * [`ChannelMonitorUpdateErr`] for requirements when returning errors.
+		 * [`ChannelMonitorUpdateStatus`] for requirements when returning errors.
 		 * 
 		 * [`Writeable::write`]: crate::util::ser::Writeable::write
 		 * 
 		 * Note that update (or a relevant inner pointer) may be NULL or all-0s to represent None
 		 */
-		Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint channel_id, ChannelMonitorUpdate update, ChannelMonitor data, MonitorUpdateId update_id);
+		ChannelMonitorUpdateStatus update_persisted_channel(OutPoint channel_id, ChannelMonitorUpdate update, ChannelMonitor data, MonitorUpdateId update_id);
 	}
 	private static class LDKPersistHolder { Persist held; }
 	public static Persist new_impl(PersistInterface arg) {
 		final LDKPersistHolder impl_holder = new LDKPersistHolder();
 		impl_holder.held = new Persist(new bindings.LDKPersist() {
-			@Override public long persist_new_channel(long channel_id, long data, long update_id) {
-				OutPoint channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new OutPoint(null, channel_id); }
-				channel_id_hu_conv.ptrs_to.add(this);
-				ChannelMonitor data_hu_conv = null; if (data < 0 || data > 4096) { data_hu_conv = new ChannelMonitor(null, data); }
-				MonitorUpdateId update_id_hu_conv = null; if (update_id < 0 || update_id > 4096) { update_id_hu_conv = new MonitorUpdateId(null, update_id); }
-				update_id_hu_conv.ptrs_to.add(this);
-				Result_NoneChannelMonitorUpdateErrZ ret = arg.persist_new_channel(channel_id_hu_conv, data_hu_conv, update_id_hu_conv);
-				long result = ret == null ? 0 : ret.clone_ptr();
-				return result;
+			@Override public ChannelMonitorUpdateStatus persist_new_channel(long channel_id, long data, long update_id) {
+				org.ldk.structs.OutPoint channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.OutPoint(null, channel_id); }
+				if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+				org.ldk.structs.ChannelMonitor data_hu_conv = null; if (data < 0 || data > 4096) { data_hu_conv = new org.ldk.structs.ChannelMonitor(null, data); }
+				org.ldk.structs.MonitorUpdateId update_id_hu_conv = null; if (update_id < 0 || update_id > 4096) { update_id_hu_conv = new org.ldk.structs.MonitorUpdateId(null, update_id); }
+				if (update_id_hu_conv != null) { update_id_hu_conv.ptrs_to.add(this); };
+				ChannelMonitorUpdateStatus ret = arg.persist_new_channel(channel_id_hu_conv, data_hu_conv, update_id_hu_conv);
+				Reference.reachabilityFence(arg);
+				return ret;
 			}
-			@Override public long update_persisted_channel(long channel_id, long update, long data, long update_id) {
-				OutPoint channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new OutPoint(null, channel_id); }
-				channel_id_hu_conv.ptrs_to.add(this);
-				ChannelMonitorUpdate update_hu_conv = null; if (update < 0 || update > 4096) { update_hu_conv = new ChannelMonitorUpdate(null, update); }
-				ChannelMonitor data_hu_conv = null; if (data < 0 || data > 4096) { data_hu_conv = new ChannelMonitor(null, data); }
-				MonitorUpdateId update_id_hu_conv = null; if (update_id < 0 || update_id > 4096) { update_id_hu_conv = new MonitorUpdateId(null, update_id); }
-				update_id_hu_conv.ptrs_to.add(this);
-				Result_NoneChannelMonitorUpdateErrZ ret = arg.update_persisted_channel(channel_id_hu_conv, update_hu_conv, data_hu_conv, update_id_hu_conv);
-				long result = ret == null ? 0 : ret.clone_ptr();
-				return result;
+			@Override public ChannelMonitorUpdateStatus update_persisted_channel(long channel_id, long update, long data, long update_id) {
+				org.ldk.structs.OutPoint channel_id_hu_conv = null; if (channel_id < 0 || channel_id > 4096) { channel_id_hu_conv = new org.ldk.structs.OutPoint(null, channel_id); }
+				if (channel_id_hu_conv != null) { channel_id_hu_conv.ptrs_to.add(this); };
+				org.ldk.structs.ChannelMonitorUpdate update_hu_conv = null; if (update < 0 || update > 4096) { update_hu_conv = new org.ldk.structs.ChannelMonitorUpdate(null, update); }
+				org.ldk.structs.ChannelMonitor data_hu_conv = null; if (data < 0 || data > 4096) { data_hu_conv = new org.ldk.structs.ChannelMonitor(null, data); }
+				org.ldk.structs.MonitorUpdateId update_id_hu_conv = null; if (update_id < 0 || update_id > 4096) { update_id_hu_conv = new org.ldk.structs.MonitorUpdateId(null, update_id); }
+				if (update_id_hu_conv != null) { update_id_hu_conv.ptrs_to.add(this); };
+				ChannelMonitorUpdateStatus ret = arg.update_persisted_channel(channel_id_hu_conv, update_hu_conv, data_hu_conv, update_id_hu_conv);
+				Reference.reachabilityFence(arg);
+				return ret;
 			}
 		});
 		return impl_holder.held;
@@ -136,20 +138,24 @@ public class Persist extends CommonBase {
 	 * and the stored channel data). Note that you **must** persist every new monitor to disk.
 	 * 
 	 * The `update_id` is used to identify this call to [`ChainMonitor::channel_monitor_updated`],
-	 * if you return [`ChannelMonitorUpdateErr::TemporaryFailure`].
+	 * if you return [`ChannelMonitorUpdateStatus::InProgress`].
 	 * 
 	 * See [`Writeable::write`] on [`ChannelMonitor`] for writing out a `ChannelMonitor`
-	 * and [`ChannelMonitorUpdateErr`] for requirements when returning errors.
+	 * and [`ChannelMonitorUpdateStatus`] for requirements when returning errors.
 	 * 
 	 * [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 	 * [`Writeable::write`]: crate::util::ser::Writeable::write
 	 */
-	public Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint channel_id, ChannelMonitor data, MonitorUpdateId update_id) {
-		long ret = bindings.Persist_persist_new_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr & ~1, data == null ? 0 : data.ptr & ~1, update_id == null ? 0 : update_id.ptr & ~1);
-		if (ret >= 0 && ret <= 4096) { return null; }
-		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(data);
-		return ret_hu_conv;
+	public ChannelMonitorUpdateStatus persist_new_channel(org.ldk.structs.OutPoint channel_id, org.ldk.structs.ChannelMonitor data, org.ldk.structs.MonitorUpdateId update_id) {
+		ChannelMonitorUpdateStatus ret = bindings.Persist_persist_new_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr, data == null ? 0 : data.ptr, update_id == null ? 0 : update_id.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(channel_id);
+		Reference.reachabilityFence(data);
+		Reference.reachabilityFence(update_id);
+		if (this != null) { this.ptrs_to.add(channel_id); };
+		if (this != null) { this.ptrs_to.add(data); };
+		if (this != null) { this.ptrs_to.add(update_id); };
+		return ret;
 	}
 
 	/**
@@ -179,23 +185,28 @@ public class Persist extends CommonBase {
 	 * whereas updates are small and `O(1)`.
 	 * 
 	 * The `update_id` is used to identify this call to [`ChainMonitor::channel_monitor_updated`],
-	 * if you return [`ChannelMonitorUpdateErr::TemporaryFailure`].
+	 * if you return [`ChannelMonitorUpdateStatus::InProgress`].
 	 * 
 	 * See [`Writeable::write`] on [`ChannelMonitor`] for writing out a `ChannelMonitor`,
 	 * [`Writeable::write`] on [`ChannelMonitorUpdate`] for writing out an update, and
-	 * [`ChannelMonitorUpdateErr`] for requirements when returning errors.
+	 * [`ChannelMonitorUpdateStatus`] for requirements when returning errors.
 	 * 
 	 * [`Writeable::write`]: crate::util::ser::Writeable::write
 	 * 
 	 * Note that update (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint channel_id, @Nullable ChannelMonitorUpdate update, ChannelMonitor data, MonitorUpdateId update_id) {
-		long ret = bindings.Persist_update_persisted_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr & ~1, update == null ? 0 : update.ptr & ~1, data == null ? 0 : data.ptr & ~1, update_id == null ? 0 : update_id.ptr & ~1);
-		if (ret >= 0 && ret <= 4096) { return null; }
-		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(update);
-		this.ptrs_to.add(data);
-		return ret_hu_conv;
+	public ChannelMonitorUpdateStatus update_persisted_channel(org.ldk.structs.OutPoint channel_id, @Nullable org.ldk.structs.ChannelMonitorUpdate update, org.ldk.structs.ChannelMonitor data, org.ldk.structs.MonitorUpdateId update_id) {
+		ChannelMonitorUpdateStatus ret = bindings.Persist_update_persisted_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr, update == null ? 0 : update.ptr, data == null ? 0 : data.ptr, update_id == null ? 0 : update_id.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(channel_id);
+		Reference.reachabilityFence(update);
+		Reference.reachabilityFence(data);
+		Reference.reachabilityFence(update_id);
+		if (this != null) { this.ptrs_to.add(channel_id); };
+		if (this != null) { this.ptrs_to.add(update); };
+		if (this != null) { this.ptrs_to.add(data); };
+		if (this != null) { this.ptrs_to.add(update_id); };
+		return ret;
 	}
 
 }