X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;h=c351b05271f4e14703596e03c3df9c79b650223c;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=c105359680ea2a8cbc9616dd444934c611998e08;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java
index c1053596..c351b052 100644
--- a/src/main/java/org/ldk/structs/ChannelInfo.java
+++ b/src/main/java/org/ldk/structs/ChannelInfo.java
@@ -25,8 +25,8 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public ChannelFeatures get_features() {
 		long ret = bindings.ChannelInfo_get_features(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelFeatures(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -41,16 +41,19 @@ public class ChannelInfo extends CommonBase {
 	/**
 	 * Source node of the first direction of a channel
 	 */
-	public byte[] get_node_one() {
-		byte[] ret = bindings.ChannelInfo_get_node_one(this.ptr);
-		return ret;
+	public NodeId get_node_one() {
+		long ret = bindings.ChannelInfo_get_node_one(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeId(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**
 	 * Source node of the first direction of a channel
 	 */
-	public void set_node_one(byte[] val) {
-		bindings.ChannelInfo_set_node_one(this.ptr, val);
+	public void set_node_one(NodeId val) {
+		bindings.ChannelInfo_set_node_one(this.ptr, val == null ? 0 : val.ptr & ~1);
 	}
 
 	/**
@@ -61,8 +64,8 @@ public class ChannelInfo extends CommonBase {
 	@Nullable
 	public DirectionalChannelInfo get_one_to_two() {
 		long ret = bindings.ChannelInfo_get_one_to_two(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		DirectionalChannelInfo ret_hu_conv = new DirectionalChannelInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		DirectionalChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DirectionalChannelInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -79,16 +82,19 @@ public class ChannelInfo extends CommonBase {
 	/**
 	 * Source node of the second direction of a channel
 	 */
-	public byte[] get_node_two() {
-		byte[] ret = bindings.ChannelInfo_get_node_two(this.ptr);
-		return ret;
+	public NodeId get_node_two() {
+		long ret = bindings.ChannelInfo_get_node_two(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeId(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**
 	 * Source node of the second direction of a channel
 	 */
-	public void set_node_two(byte[] val) {
-		bindings.ChannelInfo_set_node_two(this.ptr, val);
+	public void set_node_two(NodeId val) {
+		bindings.ChannelInfo_set_node_two(this.ptr, val == null ? 0 : val.ptr & ~1);
 	}
 
 	/**
@@ -99,8 +105,8 @@ public class ChannelInfo extends CommonBase {
 	@Nullable
 	public DirectionalChannelInfo get_two_to_one() {
 		long ret = bindings.ChannelInfo_get_two_to_one(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		DirectionalChannelInfo ret_hu_conv = new DirectionalChannelInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		DirectionalChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new DirectionalChannelInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -119,7 +125,7 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public Option_u64Z get_capacity_sats() {
 		long ret = bindings.ChannelInfo_get_capacity_sats(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Option_u64Z ret_hu_conv = Option_u64Z.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -143,8 +149,8 @@ public class ChannelInfo extends CommonBase {
 	@Nullable
 	public ChannelAnnouncement get_announcement_message() {
 		long ret = bindings.ChannelInfo_get_announcement_message(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelAnnouncement(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -164,10 +170,10 @@ public class ChannelInfo extends CommonBase {
 	/**
 	 * Constructs a new ChannelInfo given each field
 	 */
-	public static ChannelInfo of(ChannelFeatures features_arg, byte[] node_one_arg, DirectionalChannelInfo one_to_two_arg, byte[] node_two_arg, DirectionalChannelInfo two_to_one_arg, Option_u64Z capacity_sats_arg, ChannelAnnouncement announcement_message_arg) {
-		long ret = bindings.ChannelInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, node_one_arg, one_to_two_arg == null ? 0 : one_to_two_arg.ptr & ~1, node_two_arg, two_to_one_arg == null ? 0 : two_to_one_arg.ptr & ~1, capacity_sats_arg.ptr, announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelInfo ret_hu_conv = new ChannelInfo(null, ret);
+	public static ChannelInfo of(ChannelFeatures features_arg, NodeId node_one_arg, DirectionalChannelInfo one_to_two_arg, NodeId node_two_arg, DirectionalChannelInfo two_to_one_arg, Option_u64Z capacity_sats_arg, ChannelAnnouncement announcement_message_arg) {
+		long ret = bindings.ChannelInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, node_one_arg == null ? 0 : node_one_arg.ptr & ~1, one_to_two_arg == null ? 0 : one_to_two_arg.ptr & ~1, node_two_arg == null ? 0 : node_two_arg.ptr & ~1, two_to_one_arg == null ? 0 : two_to_one_arg.ptr & ~1, capacity_sats_arg.ptr, announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
@@ -177,8 +183,8 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public ChannelInfo clone() {
 		long ret = bindings.ChannelInfo_clone(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		ChannelInfo ret_hu_conv = new ChannelInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -196,7 +202,7 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public static Result_ChannelInfoDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelInfo_read(ser);
-		if (ret >= 0 && ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelInfoDecodeErrorZ ret_hu_conv = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}