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=803f8e692c944dd1b672a60f982ab4ddee9cce5f;hpb=1854b5cebef22ace9e9e4dd191f609818df9ce08;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NodeInfo.java b/src/main/java/org/ldk/structs/NodeInfo.java
index 803f8e69..e1617e84 100644
--- a/src/main/java/org/ldk/structs/NodeInfo.java
+++ b/src/main/java/org/ldk/structs/NodeInfo.java
@@ -22,39 +22,20 @@ public class NodeInfo extends CommonBase {
 
 	/**
 	 * 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);
-	}
-
-	/**
-	 * 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
+	 * Returns a copy of the field.
 	 */
-	@Nullable
-	public RoutingFees get_lowest_inbound_channel_fees() {
-		long ret = bindings.NodeInfo_get_lowest_inbound_channel_fees(this.ptr);
+	public long[] get_channels() {
+		long[] ret = bindings.NodeInfo_get_channels(this.ptr);
 		Reference.reachabilityFence(this);
-		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;
+		return ret;
 	}
 
 	/**
-	 * 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
+	 * All valid channels a node has announced
 	 */
-	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);
+	public void set_channels(long[] val) {
+		bindings.NodeInfo_set_channels(this.ptr, val);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
 	}
@@ -71,8 +52,8 @@ public class NodeInfo extends CommonBase {
 		long ret = bindings.NodeInfo_get_announcement_info(this.ptr);
 		Reference.reachabilityFence(this);
 		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);
+		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;
 	}
 
@@ -83,23 +64,26 @@ public class NodeInfo extends CommonBase {
 	 * 
 	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void set_announcement_info(@Nullable NodeAnnouncementInfo val) {
-		bindings.NodeInfo_set_announcement_info(this.ptr, val == null ? 0 : val.ptr & ~1);
+	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, 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);
+	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(lowest_inbound_channel_fees_arg);
 		Reference.reachabilityFence(announcement_info_arg);
 		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);
+		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;
 	}
 
@@ -116,11 +100,28 @@ public class NodeInfo extends CommonBase {
 		long ret = bindings.NodeInfo_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		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);
+		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;
 	}
 
+	/**
+	 * 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
 	 */