X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FExpiryTime.java;h=168816241362d8ffc938976f5fa8e9cff45a3244;hb=86706cda41dcc0d47b317b1f90a9757e44915657;hp=e88c139340bfeab24c693ca3d0192289a655b0b4;hpb=db1a11032b4164540a2d3403696be12bbca70e94;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ExpiryTime.java b/src/main/java/org/ldk/structs/ExpiryTime.java
index e88c1393..16881624 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,9 @@ public class ExpiryTime extends CommonBase {
 		if (ptr != 0) { bindings.ExpiryTime_free(ptr); }
 	}
 
-	/**
-	 * 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);
+	long clone_ptr() {
+		long ret = bindings.ExpiryTime_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -41,33 +32,63 @@ public class ExpiryTime extends CommonBase {
 	 */
 	public ExpiryTime clone() {
 		long ret = bindings.ExpiryTime_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		ExpiryTime ret_hu_conv = new ExpiryTime(null, ret);
+		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); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
 	/**
-	 * 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`.
+	 * Checks if two ExpiryTimes contain equal inner contents.
+	 */
+	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);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		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.
 	 */
-	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); }
+		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); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
@@ -76,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;
 	}
 
@@ -84,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;
 	}