X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetworkGraph.java;h=299f4547a19503de7542ee831826e365992597c7;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=b010679db4e687ceb4d71293f6e38809988fa9d8;hpb=db1a11032b4164540a2d3403696be12bbca70e94;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NetworkGraph.java b/src/main/java/org/ldk/structs/NetworkGraph.java
index b010679d..299f4547 100644
--- a/src/main/java/org/ldk/structs/NetworkGraph.java
+++ b/src/main/java/org/ldk/structs/NetworkGraph.java
@@ -24,8 +24,8 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public NetworkGraph clone() {
 		long ret = bindings.NetworkGraph_clone(this.ptr);
-		if (ret < 1024) { return null; }
-		NetworkGraph ret_hu_conv = new NetworkGraph(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -43,7 +43,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public static Result_NetworkGraphDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.NetworkGraph_read(ser);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NetworkGraphDecodeErrorZ ret_hu_conv = Result_NetworkGraphDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -53,12 +53,23 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public static NetworkGraph of(byte[] genesis_hash) {
 		long ret = bindings.NetworkGraph_new(genesis_hash);
-		if (ret < 1024) { return null; }
-		NetworkGraph ret_hu_conv = new NetworkGraph(null, ret);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetworkGraph(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Returns a read-only view of the network graph.
+	 */
+	public ReadOnlyNetworkGraph read_only() {
+		long ret = bindings.NetworkGraph_read_only(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ReadOnlyNetworkGraph ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ReadOnlyNetworkGraph(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 	/**
 	 * For an already known node (from channel announcements), update its stored properties from a
 	 * given node announcement.
@@ -69,7 +80,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_node_from_announcement(NodeAnnouncement msg) {
 		long ret = bindings.NetworkGraph_update_node_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -83,7 +94,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_node_from_unsigned_announcement(UnsignedNodeAnnouncement msg) {
 		long ret = bindings.NetworkGraph_update_node_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -98,15 +109,12 @@ public class NetworkGraph extends CommonBase {
 	 * 
 	 * If a `chain::Access` object is provided via `chain_access`, it will be called to verify
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
-	 * 
-	 * Note that chain_access (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_NoneLightningErrorZ update_channel_from_announcement(ChannelAnnouncement msg, @Nullable Access chain_access) {
-		long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access == null ? 0 : chain_access.ptr);
-		if (ret < 1024) { return null; }
+	public Result_NoneLightningErrorZ update_channel_from_announcement(ChannelAnnouncement msg, Option_AccessZ chain_access) {
+		long ret = bindings.NetworkGraph_update_channel_from_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
-		this.ptrs_to.add(chain_access);
 		return ret_hu_conv;
 	}
 
@@ -117,15 +125,12 @@ public class NetworkGraph extends CommonBase {
 	 * 
 	 * If a `chain::Access` object is provided via `chain_access`, it will be called to verify
 	 * the corresponding UTXO exists on chain and is correctly-formatted.
-	 * 
-	 * Note that chain_access (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public Result_NoneLightningErrorZ update_channel_from_unsigned_announcement(UnsignedChannelAnnouncement msg, @Nullable Access chain_access) {
-		long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access == null ? 0 : chain_access.ptr);
-		if (ret < 1024) { return null; }
+	public Result_NoneLightningErrorZ update_channel_from_unsigned_announcement(UnsignedChannelAnnouncement msg, Option_AccessZ chain_access) {
+		long ret = bindings.NetworkGraph_update_channel_from_unsigned_announcement(this.ptr, msg == null ? 0 : msg.ptr & ~1, chain_access.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
-		this.ptrs_to.add(chain_access);
 		return ret_hu_conv;
 	}
 
@@ -139,6 +144,13 @@ public class NetworkGraph extends CommonBase {
 		bindings.NetworkGraph_close_channel_from_update(this.ptr, short_channel_id, is_permanent);
 	}
 
+	/**
+	 * Marks a node in the graph as failed.
+	 */
+	public void fail_node(byte[] _node_id, boolean is_permanent) {
+		bindings.NetworkGraph_fail_node(this.ptr, _node_id, is_permanent);
+	}
+
 	/**
 	 * For an already known (from announcement) channel, update info about one of the directions
 	 * of the channel.
@@ -149,7 +161,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_channel(ChannelUpdate msg) {
 		long ret = bindings.NetworkGraph_update_channel(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;
@@ -162,7 +174,7 @@ public class NetworkGraph extends CommonBase {
 	 */
 	public Result_NoneLightningErrorZ update_channel_unsigned(UnsignedChannelUpdate msg) {
 		long ret = bindings.NetworkGraph_update_channel_unsigned(this.ptr, msg == null ? 0 : msg.ptr & ~1);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneLightningErrorZ ret_hu_conv = Result_NoneLightningErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(msg);
 		return ret_hu_conv;