X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeInfo.java;h=e091c6c692e74fd1c0cbaeb2538c987657b63028;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=68a027a458eb0cb9122374d2b32cc9f6dbb1f5a2;hpb=b0c50b891cbca28d3bd1d86276c132ff5221d8e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeInfo.java b/src/main/java/org/ldk/structs/NodeInfo.java
index 68a027a4..e091c6c6 100644
--- a/src/main/java/org/ldk/structs/NodeInfo.java
+++ b/src/main/java/org/ldk/structs/NodeInfo.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;
 
 
 /**
@@ -29,10 +30,14 @@ public class NodeInfo extends CommonBase {
 	 * Lowest fees enabling routing via any of the enabled, known channels to a node.
 	 * The two fields (flat and proportional fee) are independent,
 	 * meaning they don't have to refer to the same channel.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public RoutingFees get_lowest_inbound_channel_fees() {
 		long ret = bindings.NodeInfo_get_lowest_inbound_channel_fees(this.ptr);
-		RoutingFees ret_hu_conv = new RoutingFees(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		RoutingFees ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new RoutingFees(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -41,20 +46,25 @@ public class NodeInfo extends CommonBase {
 	 * Lowest fees enabling routing via any of the enabled, known channels to a node.
 	 * The two fields (flat and proportional fee) are independent,
 	 * meaning they don't have to refer to the same channel.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_lowest_inbound_channel_fees(RoutingFees val) {
+	public void set_lowest_inbound_channel_fees(@Nullable RoutingFees val) {
 		bindings.NodeInfo_set_lowest_inbound_channel_fees(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * More information about a node from node_announcement.
 	 * Optional because we store a Node entry after learning about it from
 	 * a channel announcement, but before receiving a node announcement.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
+	@Nullable
 	public NodeAnnouncementInfo get_announcement_info() {
 		long ret = bindings.NodeInfo_get_announcement_info(this.ptr);
-		NodeAnnouncementInfo ret_hu_conv = new NodeAnnouncementInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeAnnouncementInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeAnnouncementInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -63,10 +73,11 @@ public class NodeInfo extends CommonBase {
 	 * More information about a node from node_announcement.
 	 * Optional because we store a Node entry after learning about it from
 	 * a channel announcement, but before receiving a node announcement.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_announcement_info(NodeAnnouncementInfo val) {
+	public void set_announcement_info(@Nullable NodeAnnouncementInfo val) {
 		bindings.NodeInfo_set_announcement_info(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -74,19 +85,24 @@ public class NodeInfo extends CommonBase {
 	 */
 	public static NodeInfo of(long[] channels_arg, RoutingFees lowest_inbound_channel_fees_arg, NodeAnnouncementInfo announcement_info_arg) {
 		long ret = bindings.NodeInfo_new(channels_arg, lowest_inbound_channel_fees_arg == null ? 0 : lowest_inbound_channel_fees_arg.ptr & ~1, announcement_info_arg == null ? 0 : announcement_info_arg.ptr & ~1);
-		NodeInfo ret_hu_conv = new NodeInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(lowest_inbound_channel_fees_arg);
-		ret_hu_conv.ptrs_to.add(announcement_info_arg);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.NodeInfo_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the NodeInfo
 	 */
 	public NodeInfo clone() {
 		long ret = bindings.NodeInfo_clone(this.ptr);
-		NodeInfo ret_hu_conv = new NodeInfo(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeInfo(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -104,6 +120,7 @@ public class NodeInfo extends CommonBase {
 	 */
 	public static Result_NodeInfoDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.NodeInfo_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NodeInfoDecodeErrorZ ret_hu_conv = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}