X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FFallback.java;h=190bbe904b5bb251b2f7ac2718a9251359013b3f;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=a94becab9af7a893ef9347eac71eddbd51170a08;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Fallback.java b/src/main/java/org/ldk/structs/Fallback.java
index a94becab..190bbe90 100644
--- a/src/main/java/org/ldk/structs/Fallback.java
+++ b/src/main/java/org/ldk/structs/Fallback.java
@@ -34,12 +34,12 @@ public class Fallback extends CommonBase {
 	}
 
 	public final static class SegWitProgram extends Fallback {
-		public final UInt5 version;
+		public final org.ldk.util.WitnessVersion version;
 		public final byte[] program;
 		private SegWitProgram(long ptr, bindings.LDKFallback.SegWitProgram obj) {
 			super(null, ptr);
 			byte version = obj.version;
-			UInt5 version_conv = new UInt5(version);
+			WitnessVersion version_conv = new WitnessVersion(version);
 			this.version = version_conv;
 			this.program = obj.program;
 		}
@@ -71,21 +71,21 @@ public class Fallback extends CommonBase {
 		long ret = bindings.Fallback_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		Fallback ret_hu_conv = Fallback.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.Fallback ret_hu_conv = org.ldk.structs.Fallback.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Utility method to constructs a new SegWitProgram-variant Fallback
 	 */
-	public static Fallback seg_wit_program(UInt5 version, byte[] program) {
+	public static Fallback seg_wit_program(org.ldk.util.WitnessVersion version, byte[] program) {
 		long ret = bindings.Fallback_seg_wit_program(version.getVal(), program);
 		Reference.reachabilityFence(version);
 		Reference.reachabilityFence(program);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		Fallback ret_hu_conv = Fallback.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.Fallback ret_hu_conv = org.ldk.structs.Fallback.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -96,8 +96,8 @@ public class Fallback extends CommonBase {
 		long ret = bindings.Fallback_pub_key_hash(InternalUtils.check_arr_len(a, 20));
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		Fallback ret_hu_conv = Fallback.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.Fallback ret_hu_conv = org.ldk.structs.Fallback.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -108,13 +108,13 @@ public class Fallback extends CommonBase {
 		long ret = bindings.Fallback_script_hash(InternalUtils.check_arr_len(a, 20));
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		Fallback ret_hu_conv = Fallback.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.Fallback ret_hu_conv = org.ldk.structs.Fallback.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
 	/**
-	 * Checks if two Fallbacks contain equal inner contents.
+	 * Generates a non-cryptographic 64-bit hash of the Fallback.
 	 */
 	public long hash() {
 		long ret = bindings.Fallback_hash(this.ptr);
@@ -129,8 +129,8 @@ public class Fallback extends CommonBase {
 	 * Checks if two Fallbacks contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 */
-	public boolean eq(Fallback b) {
-		boolean ret = bindings.Fallback_eq(this.ptr, b == null ? 0 : b.ptr & ~1);
+	public boolean eq(org.ldk.structs.Fallback b) {
+		boolean ret = bindings.Fallback_eq(this.ptr, b.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(b);
 		return ret;