X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FNetGraphMsgHandler.java;h=4331c73f74877c79361636efe99614d7045a7975;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=802258808d4557a20e5e3a09cce03b331aa60588;hpb=db1a11032b4164540a2d3403696be12bbca70e94;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/NetGraphMsgHandler.java b/src/main/java/org/ldk/structs/NetGraphMsgHandler.java
index 80225880..4331c73f 100644
--- a/src/main/java/org/ldk/structs/NetGraphMsgHandler.java
+++ b/src/main/java/org/ldk/structs/NetGraphMsgHandler.java
@@ -13,6 +13,9 @@ import javax.annotation.Nullable;
  * This network graph is then used for routing payments.
  * Provides interface to help with initial routing sync by
  * serving historical announcements.
+ * 
+ * Serves as an [`EventHandler`] for applying updates from [`Event::PaymentPathFailed`] to the
+ * [`NetworkGraph`].
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class NetGraphMsgHandler extends CommonBase {
@@ -24,38 +27,32 @@ public class NetGraphMsgHandler extends CommonBase {
 	}
 
 	/**
-	 * Creates a new tracker of the actual state of the network of channels and nodes,
-	 * assuming a fresh network graph.
-	 * Chain monitor is used to make sure announced channels exist on-chain,
-	 * channel data is correct, and that the announcement is signed with
-	 * channel owners' keys.
-	 * 
-	 * Note that chain_access (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 * Constructs a new EventHandler which calls the relevant methods on this_arg.
+	 * This copies the `inner` pointer in this_arg and thus the returned EventHandler must be freed before this_arg is
 	 */
-	public static NetGraphMsgHandler of(byte[] genesis_hash, @Nullable Access chain_access, Logger logger) {
-		long ret = bindings.NetGraphMsgHandler_new(genesis_hash, chain_access == null ? 0 : chain_access.ptr, logger == null ? 0 : logger.ptr);
-		if (ret < 1024) { return null; }
-		NetGraphMsgHandler ret_hu_conv = new NetGraphMsgHandler(null, ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(chain_access);
-		ret_hu_conv.ptrs_to.add(logger);
+	public EventHandler as_EventHandler() {
+		long ret = bindings.NetGraphMsgHandler_as_EventHandler(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		EventHandler ret_hu_conv = new EventHandler(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
 	/**
 	 * Creates a new tracker of the actual state of the network of channels and nodes,
 	 * assuming an existing Network Graph.
-	 * 
-	 * Note that chain_access (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 * Chain monitor is used to make sure announced channels exist on-chain,
+	 * channel data is correct, and that the announcement is signed with
+	 * channel owners' keys.
 	 */
-	public static NetGraphMsgHandler from_net_graph(@Nullable Access chain_access, Logger logger, NetworkGraph network_graph) {
-		long ret = bindings.NetGraphMsgHandler_from_net_graph(chain_access == null ? 0 : chain_access.ptr, logger == null ? 0 : logger.ptr, network_graph == null ? 0 : network_graph.ptr & ~1);
-		if (ret < 1024) { return null; }
-		NetGraphMsgHandler ret_hu_conv = new NetGraphMsgHandler(null, ret);
+	public static NetGraphMsgHandler of(NetworkGraph network_graph, Option_AccessZ chain_access, Logger logger) {
+		long ret = bindings.NetGraphMsgHandler_new(network_graph == null ? 0 : network_graph.ptr & ~1, chain_access.ptr, logger == null ? 0 : logger.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		NetGraphMsgHandler ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new NetGraphMsgHandler(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(network_graph);
 		ret_hu_conv.ptrs_to.add(chain_access);
 		ret_hu_conv.ptrs_to.add(logger);
-		ret_hu_conv.ptrs_to.add(network_graph);
 		return ret_hu_conv;
 	}
 
@@ -63,35 +60,19 @@ public class NetGraphMsgHandler extends CommonBase {
 	 * Adds a provider used to check new announcements. Does not affect
 	 * existing announcements unless they are updated.
 	 * Add, update or remove the provider would replace the current one.
-	 * 
-	 * Note that chain_access (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public void add_chain_access(@Nullable Access chain_access) {
-		bindings.NetGraphMsgHandler_add_chain_access(this.ptr, chain_access == null ? 0 : chain_access.ptr);
+	public void add_chain_access(Option_AccessZ chain_access) {
+		bindings.NetGraphMsgHandler_add_chain_access(this.ptr, chain_access.ptr);
 		this.ptrs_to.add(chain_access);
 	}
 
-	/**
-	 * Take a read lock on the network_graph and return it in the C-bindings
-	 * newtype helper. This is likely only useful when called via the C
-	 * bindings as you can call `self.network_graph.read().unwrap()` in Rust
-	 * yourself.
-	 */
-	public LockedNetworkGraph read_locked_graph() {
-		long ret = bindings.NetGraphMsgHandler_read_locked_graph(this.ptr);
-		if (ret < 1024) { return null; }
-		LockedNetworkGraph ret_hu_conv = new LockedNetworkGraph(null, ret);
-		ret_hu_conv.ptrs_to.add(this);
-		return ret_hu_conv;
-	}
-
 	/**
 	 * Constructs a new RoutingMessageHandler which calls the relevant methods on this_arg.
 	 * This copies the `inner` pointer in this_arg and thus the returned RoutingMessageHandler must be freed before this_arg is
 	 */
 	public RoutingMessageHandler as_RoutingMessageHandler() {
 		long ret = bindings.NetGraphMsgHandler_as_RoutingMessageHandler(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		RoutingMessageHandler ret_hu_conv = new RoutingMessageHandler(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
@@ -103,7 +84,7 @@ public class NetGraphMsgHandler extends CommonBase {
 	 */
 	public MessageSendEventsProvider as_MessageSendEventsProvider() {
 		long ret = bindings.NetGraphMsgHandler_as_MessageSendEventsProvider(this.ptr);
-		if (ret < 1024) { return null; }
+		if (ret >= 0 && ret <= 4096) { return null; }
 		MessageSendEventsProvider ret_hu_conv = new MessageSendEventsProvider(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;