X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;h=61b4bce3e2b0f0251f990c3cf1fe11847c9e8952;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=dc995e791035cc919e7207e7c9f67442983ad1a2;hpb=c3ae2d6897e5a809459c8d9a72a4b3aa0052c8c8;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java
index dc995e79..61b4bce3 100644
--- a/src/main/java/org/ldk/structs/ChannelInfo.java
+++ b/src/main/java/org/ldk/structs/ChannelInfo.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -24,7 +25,8 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public ChannelFeatures get_features() {
 		long ret = bindings.ChannelInfo_get_features(this.ptr);
-		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;
 	}
@@ -34,73 +36,88 @@ public class ChannelInfo extends CommonBase {
 	 */
 	public void set_features(ChannelFeatures val) {
 		bindings.ChannelInfo_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * 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);
 	}
 
 	/**
 	 * Details about the first direction of a channel
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public DirectionalChannelInfo get_one_to_two() {
 		long ret = bindings.ChannelInfo_get_one_to_two(this.ptr);
-		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;
 	}
 
 	/**
 	 * Details about the first direction of a channel
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_one_to_two(DirectionalChannelInfo val) {
+	public void set_one_to_two(@Nullable DirectionalChannelInfo val) {
 		bindings.ChannelInfo_set_one_to_two(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * 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);
 	}
 
 	/**
 	 * Details about the second direction of a channel
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public DirectionalChannelInfo get_two_to_one() {
 		long ret = bindings.ChannelInfo_get_two_to_one(this.ptr);
-		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;
 	}
 
 	/**
 	 * Details about the second direction of a channel
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_two_to_one(DirectionalChannelInfo val) {
+	public void set_two_to_one(@Nullable DirectionalChannelInfo val) {
 		bindings.ChannelInfo_set_two_to_one(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -108,6 +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 <= 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;
@@ -125,10 +143,14 @@ public class ChannelInfo extends CommonBase {
 	 * Mostly redundant with the data we store in fields explicitly.
 	 * Everything else is useful only for sending out for initial routing sync.
 	 * Not stored if contains excess data to prevent DoS.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public ChannelAnnouncement get_announcement_message() {
 		long ret = bindings.ChannelInfo_get_announcement_message(this.ptr);
-		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;
 	}
@@ -138,32 +160,36 @@ public class ChannelInfo extends CommonBase {
 	 * Mostly redundant with the data we store in fields explicitly.
 	 * Everything else is useful only for sending out for initial routing sync.
 	 * Not stored if contains excess data to prevent DoS.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_announcement_message(ChannelAnnouncement val) {
+	public void set_announcement_message(@Nullable ChannelAnnouncement val) {
 		bindings.ChannelInfo_set_announcement_message(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new ChannelInfo given each field
 	 */
-	public static ChannelInfo constructor_new(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);
-		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);
-		ret_hu_conv.ptrs_to.add(features_arg);
-		ret_hu_conv.ptrs_to.add(one_to_two_arg);
-		ret_hu_conv.ptrs_to.add(two_to_one_arg);
-		ret_hu_conv.ptrs_to.add(announcement_message_arg);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.ChannelInfo_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the ChannelInfo
 	 */
 	public ChannelInfo clone() {
 		long ret = bindings.ChannelInfo_clone(this.ptr);
-		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;
 	}
@@ -179,8 +205,9 @@ public class ChannelInfo extends CommonBase {
 	/**
 	 * Read a ChannelInfo from a byte array, created by ChannelInfo_write
 	 */
-	public static Result_ChannelInfoDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_ChannelInfoDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.ChannelInfo_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_ChannelInfoDecodeErrorZ ret_hu_conv = Result_ChannelInfoDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}