X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FExpiryTime.java;h=a187cb5073b930b357eac7e7ee9eecb4a5afeac2;hb=f385eff0dd0aa61fbf21ae946c424f4a6a26de04;hp=4c1c918306db8610d3c9d6116471c1f6a612958c;hpb=a7653cf8717b1f9df4d3f4c4bd0b1f50f3bbc230;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ExpiryTime.java b/src/main/java/org/ldk/structs/ExpiryTime.java
index 4c1c9183..a187cb50 100644
--- a/src/main/java/org/ldk/structs/ExpiryTime.java
+++ b/src/main/java/org/ldk/structs/ExpiryTime.java
@@ -4,17 +4,13 @@ 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;
 
 
 /**
  * Positive duration that defines when (relatively to the timestamp) in the future the invoice
  * expires
- * 
- * # Invariants
- * The number of seconds this expiry time represents has to be in the range
- * `0...(SYSTEM_TIME_MAX_UNIX_TIMESTAMP - MAX_EXPIRY_TIME)` to avoid overflows when adding it to a
- * timestamp
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ExpiryTime extends CommonBase {
@@ -25,14 +21,21 @@ public class ExpiryTime extends CommonBase {
 		if (ptr != 0) { bindings.ExpiryTime_free(ptr); }
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ExpiryTime_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ExpiryTime
 	 */
 	public ExpiryTime clone() {
 		long ret = bindings.ExpiryTime_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		ExpiryTime ret_hu_conv = new ExpiryTime(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -41,41 +44,51 @@ public class ExpiryTime extends CommonBase {
 	 */
 	public long hash() {
 		long ret = bindings.ExpiryTime_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two ExpiryTimes contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 * Two objects with NULL inner values will be considered "equal" here.
 	 */
 	public boolean eq(ExpiryTime b) {
-		boolean ret = bindings.ExpiryTime_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
-		this.ptrs_to.add(b);
+		boolean ret = bindings.ExpiryTime_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
 		return ret;
 	}
 
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof ExpiryTime)) return false;
+		return this.eq((ExpiryTime)o);
+	}
 	/**
-	 * Construct an `ExpiryTime` from seconds. If there exists a `PositiveTimestamp` which would
-	 * overflow on adding the `EpiryTime` to it then this function will return a
-	 * `CreationError::ExpiryTimeOutOfBounds`.
+	 * Construct an `ExpiryTime` from seconds.
 	 */
-	public static Result_ExpiryTimeCreationErrorZ from_seconds(long seconds) {
+	public static ExpiryTime from_seconds(long seconds) {
 		long ret = bindings.ExpiryTime_from_seconds(seconds);
-		if (ret < 1024) { return null; }
-		Result_ExpiryTimeCreationErrorZ ret_hu_conv = Result_ExpiryTimeCreationErrorZ.constr_from_ptr(ret);
+		Reference.reachabilityFence(seconds);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Construct an `ExpiryTime` from a `Duration`. If there exists a `PositiveTimestamp` which
-	 * would overflow on adding the `EpiryTime` to it then this function will return a
-	 * `CreationError::ExpiryTimeOutOfBounds`.
+	 * Construct an `ExpiryTime` from a `Duration`.
 	 */
-	public static Result_ExpiryTimeCreationErrorZ from_duration(long duration) {
+	public static ExpiryTime from_duration(long duration) {
 		long ret = bindings.ExpiryTime_from_duration(duration);
-		if (ret < 1024) { return null; }
-		Result_ExpiryTimeCreationErrorZ ret_hu_conv = Result_ExpiryTimeCreationErrorZ.constr_from_ptr(ret);
+		Reference.reachabilityFence(duration);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ExpiryTime ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ExpiryTime(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -84,6 +97,7 @@ public class ExpiryTime extends CommonBase {
 	 */
 	public long as_seconds() {
 		long ret = bindings.ExpiryTime_as_seconds(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -92,6 +106,7 @@ public class ExpiryTime extends CommonBase {
 	 */
 	public long as_duration() {
 		long ret = bindings.ExpiryTime_as_duration(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}