X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeAnnouncementInfo.java;h=7b0293286db0ce70c12e6efff68fc5ab1c1a5c0e;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=3c3b5739d2178d59fc199d1e55b43359f62baa8b;hpb=1b870a3ffab1c0024411e30102bc6d198300f095;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java b/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java
index 3c3b5739..7b029328 100644
--- a/src/main/java/org/ldk/structs/NodeAnnouncementInfo.java
+++ b/src/main/java/org/ldk/structs/NodeAnnouncementInfo.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;
 
 
 /**
@@ -23,7 +24,8 @@ public class NodeAnnouncementInfo extends CommonBase {
 	 */
 	public NodeFeatures get_features() {
 		long ret = bindings.NodeAnnouncementInfo_get_features(this.ptr);
-		NodeFeatures ret_hu_conv = new NodeFeatures(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeFeatures(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -33,7 +35,6 @@ public class NodeAnnouncementInfo extends CommonBase {
 	 */
 	public void set_features(NodeFeatures val) {
 		bindings.NodeAnnouncementInfo_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
@@ -65,7 +66,7 @@ public class NodeAnnouncementInfo extends CommonBase {
 	 * Color assigned to the node
 	 */
 	public void set_rgb(byte[] val) {
-		bindings.NodeAnnouncementInfo_set_rgb(this.ptr, val);
+		bindings.NodeAnnouncementInfo_set_rgb(this.ptr, InternalUtils.check_arr_len(val, 3));
 	}
 
 	/**
@@ -84,15 +85,14 @@ public class NodeAnnouncementInfo extends CommonBase {
 	 * should not be exposed to the user.
 	 */
 	public void set_alias(byte[] val) {
-		bindings.NodeAnnouncementInfo_set_alias(this.ptr, val);
+		bindings.NodeAnnouncementInfo_set_alias(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
 	/**
 	 * Internet-level addresses via which one can connect to the node
 	 */
 	public void set_addresses(NetAddress[] val) {
-		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, Arrays.stream(val).mapToLong(val_conv_12 -> val_conv_12.ptr).toArray());
-		/* TODO 2 NetAddress  */;
+		bindings.NodeAnnouncementInfo_set_addresses(this.ptr, val != null ? Arrays.stream(val).mapToLong(val_conv_12 -> val_conv_12.ptr).toArray() : null);
 	}
 
 	/**
@@ -100,10 +100,14 @@ public class NodeAnnouncementInfo 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 NodeAnnouncement get_announcement_message() {
 		long ret = bindings.NodeAnnouncementInfo_get_announcement_message(this.ptr);
-		NodeAnnouncement ret_hu_conv = new NodeAnnouncement(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NodeAnnouncement ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NodeAnnouncement(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -113,31 +117,36 @@ public class NodeAnnouncementInfo 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(NodeAnnouncement val) {
+	public void set_announcement_message(@Nullable NodeAnnouncement val) {
 		bindings.NodeAnnouncementInfo_set_announcement_message(this.ptr, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new NodeAnnouncementInfo given each field
 	 */
-	public static NodeAnnouncementInfo constructor_new(NodeFeatures features_arg, int last_update_arg, byte[] rgb_arg, byte[] alias_arg, NetAddress[] addresses_arg, NodeAnnouncement announcement_message_arg) {
-		long ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, rgb_arg, alias_arg, Arrays.stream(addresses_arg).mapToLong(addresses_arg_conv_12 -> addresses_arg_conv_12.ptr).toArray(), announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
-		NodeAnnouncementInfo ret_hu_conv = new NodeAnnouncementInfo(null, ret);
+	public static NodeAnnouncementInfo of(NodeFeatures features_arg, int last_update_arg, byte[] rgb_arg, byte[] alias_arg, NetAddress[] addresses_arg, NodeAnnouncement announcement_message_arg) {
+		long ret = bindings.NodeAnnouncementInfo_new(features_arg == null ? 0 : features_arg.ptr & ~1, last_update_arg, InternalUtils.check_arr_len(rgb_arg, 3), InternalUtils.check_arr_len(alias_arg, 32), addresses_arg != null ? Arrays.stream(addresses_arg).mapToLong(addresses_arg_conv_12 -> addresses_arg_conv_12.ptr).toArray() : null, announcement_message_arg == null ? 0 : announcement_message_arg.ptr & ~1);
+		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(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(features_arg);
-		/* TODO 2 NetAddress  */;
-		ret_hu_conv.ptrs_to.add(announcement_message_arg);
 		return ret_hu_conv;
 	}
 
+	long clone_ptr() {
+		long ret = bindings.NodeAnnouncementInfo_clone_ptr(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a copy of the NodeAnnouncementInfo
 	 */
 	public NodeAnnouncementInfo clone() {
 		long ret = bindings.NodeAnnouncementInfo_clone(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;
 	}
@@ -153,8 +162,9 @@ public class NodeAnnouncementInfo extends CommonBase {
 	/**
 	 * Read a NodeAnnouncementInfo from a byte array, created by NodeAnnouncementInfo_write
 	 */
-	public static Result_NodeAnnouncementInfoDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_NodeAnnouncementInfoDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.NodeAnnouncementInfo_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NodeAnnouncementInfoDecodeErrorZ ret_hu_conv = Result_NodeAnnouncementInfoDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}