X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNodeInfo.java;h=e1617e846f53b1ffd4a75b086e3f3b106665f97c;hb=07d5d868dfe064aadb28a7f7ca6002c16be9723d;hp=4812f2f36160ba77c9e30d9a48b70e91b0564051;hpb=ad15b3a4dbf3fbc7f08ef22d656bae79e8182008;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeInfo.java b/src/main/java/org/ldk/structs/NodeInfo.java
index 4812f2f3..e1617e84 100644
--- a/src/main/java/org/ldk/structs/NodeInfo.java
+++ b/src/main/java/org/ldk/structs/NodeInfo.java
@@ -2,39 +2,144 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
+
+/**
+ * Details about a node in the network, known from the network announcement.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class NodeInfo extends CommonBase {
 	NodeInfo(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.NodeInfo_free(ptr);
+		if (ptr != 0) { bindings.NodeInfo_free(ptr); }
+	}
+
+	/**
+	 * All valid channels a node has announced
+	 * 
+	 * Returns a copy of the field.
+	 */
+	public long[] get_channels() {
+		long[] ret = bindings.NodeInfo_get_channels(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	/**
+	 * All valid channels a node has announced
+	 */
+	public void set_channels(long[] val) {
+		bindings.NodeInfo_set_channels(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(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);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeAnnouncementInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeAnnouncementInfo(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
-	// Skipped NodeInfo_set_channels
-	public RoutingFees get_lowest_inbound_channel_fees(NodeInfo this_ptr) {
-		RoutingFees ret = new RoutingFees(null, bindings.NodeInfo_get_lowest_inbound_channel_fees(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * 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(@Nullable org.ldk.structs.NodeAnnouncementInfo val) {
+		bindings.NodeInfo_set_announcement_info(this.ptr, val == null ? 0 : val.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
+	}
+
+	/**
+	 * Constructs a new NodeInfo given each field
+	 * 
+	 * Note that announcement_info_arg (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public static NodeInfo of(long[] channels_arg, @Nullable org.ldk.structs.NodeAnnouncementInfo announcement_info_arg) {
+		long ret = bindings.NodeInfo_new(channels_arg, announcement_info_arg == null ? 0 : announcement_info_arg.ptr);
+		Reference.reachabilityFence(channels_arg);
+		Reference.reachabilityFence(announcement_info_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeInfo(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(announcement_info_arg); };
+		return ret_hu_conv;
+	}
+
+	long clone_ptr() {
+		long ret = bindings.NodeInfo_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	public void set_lowest_inbound_channel_fees(NodeInfo this_ptr, RoutingFees val) {
-		bindings.NodeInfo_set_lowest_inbound_channel_fees(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	/**
+	 * Creates a copy of the NodeInfo
+	 */
+	public NodeInfo clone() {
+		long ret = bindings.NodeInfo_clone(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.NodeInfo ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.NodeInfo(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
-	public NodeAnnouncementInfo get_announcement_info(NodeInfo this_ptr) {
-		NodeAnnouncementInfo ret = new NodeAnnouncementInfo(null, bindings.NodeInfo_get_announcement_info(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Checks if two NodeInfos contain equal inner contents.
+	 * This ignores pointers and is_owned flags and looks at the values in fields.
+	 * Two objects with NULL inner values will be considered "equal" here.
+	 */
+	public boolean eq(org.ldk.structs.NodeInfo b) {
+		boolean ret = bindings.NodeInfo_eq(this.ptr, b == null ? 0 : b.ptr);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(b);
+		if (this != null) { this.ptrs_to.add(b); };
+		return ret;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (!(o instanceof NodeInfo)) return false;
+		return this.eq((NodeInfo)o);
+	}
+	/**
+	 * Serialize the NodeInfo object into a byte array which can be read by NodeInfo_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.NodeInfo_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
-	// Skipped NodeInfo_set_announcement_info
-	// Skipped NodeInfo_new
-	// Skipped NodeInfo_write
-	public NodeInfo(byte[] ser) {
-		super(bindings.NodeInfo_read(ser));
+	/**
+	 * Read a NodeInfo from a byte array, created by NodeInfo_write
+	 */
+	public static Result_NodeInfoDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.NodeInfo_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_NodeInfoDecodeErrorZ ret_hu_conv = Result_NodeInfoDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }