X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FScore.java;h=5e7fd85fb379413cbce75803dd543dcdee402c52;hb=5e9de82b3a7712a41189756d9d16d946142b2ac5;hp=347edf6a216a667260df941ad19deff156f67b2d;hpb=8f5edad2f310a130b658e1b530fe2516724c4d99;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Score.java b/src/main/java/org/ldk/structs/Score.java
index 347edf6a..5e7fd85f 100644
--- a/src/main/java/org/ldk/structs/Score.java
+++ b/src/main/java/org/ldk/structs/Score.java
@@ -67,7 +67,7 @@ public class Score extends CommonBase {
 				org.ldk.structs.NodeId source_hu_conv = null; if (source < 0 || source > 4096) { source_hu_conv = new org.ldk.structs.NodeId(null, source); }
 				org.ldk.structs.NodeId target_hu_conv = null; if (target < 0 || target > 4096) { target_hu_conv = new org.ldk.structs.NodeId(null, target); }
 				org.ldk.structs.ChannelUsage usage_hu_conv = null; if (usage < 0 || usage > 4096) { usage_hu_conv = new org.ldk.structs.ChannelUsage(null, usage); }
-				usage_hu_conv.ptrs_to.add(this);
+				if (usage_hu_conv != null) { usage_hu_conv.ptrs_to.add(this); };
 				long ret = arg.channel_penalty_msat(short_channel_id, source_hu_conv, target_hu_conv, usage_hu_conv);
 				Reference.reachabilityFence(arg);
 				return ret;
@@ -78,7 +78,7 @@ public class Score extends CommonBase {
 				for (int k = 0; k < path_conv_10_len; k++) {
 					long path_conv_10 = path[k];
 					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
-					path_conv_10_hu_conv.ptrs_to.add(this);
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
 					path_conv_10_arr[k] = path_conv_10_hu_conv;
 				}
 				arg.payment_path_failed(path_conv_10_arr, short_channel_id);
@@ -90,7 +90,7 @@ public class Score extends CommonBase {
 				for (int k = 0; k < path_conv_10_len; k++) {
 					long path_conv_10 = path[k];
 					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
-					path_conv_10_hu_conv.ptrs_to.add(this);
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
 					path_conv_10_arr[k] = path_conv_10_hu_conv;
 				}
 				arg.payment_path_successful(path_conv_10_arr);
@@ -102,7 +102,7 @@ public class Score extends CommonBase {
 				for (int k = 0; k < path_conv_10_len; k++) {
 					long path_conv_10 = path[k];
 					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
-					path_conv_10_hu_conv.ptrs_to.add(this);
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
 					path_conv_10_arr[k] = path_conv_10_hu_conv;
 				}
 				arg.probe_failed(path_conv_10_arr, short_channel_id);
@@ -114,7 +114,7 @@ public class Score extends CommonBase {
 				for (int k = 0; k < path_conv_10_len; k++) {
 					long path_conv_10 = path[k];
 					org.ldk.structs.RouteHop path_conv_10_hu_conv = null; if (path_conv_10 < 0 || path_conv_10 > 4096) { path_conv_10_hu_conv = new org.ldk.structs.RouteHop(null, path_conv_10); }
-					path_conv_10_hu_conv.ptrs_to.add(this);
+					if (path_conv_10_hu_conv != null) { path_conv_10_hu_conv.ptrs_to.add(this); };
 					path_conv_10_arr[k] = path_conv_10_hu_conv;
 				}
 				arg.probe_successful(path_conv_10_arr);
@@ -139,14 +139,15 @@ public class Score extends CommonBase {
 	 * Thus, implementations should be overflow-safe.
 	 */
 	public long channel_penalty_msat(long short_channel_id, NodeId source, NodeId target, ChannelUsage usage) {
-		long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : source.ptr & ~1, target == null ? 0 : target.ptr & ~1, usage == null ? 0 : usage.ptr & ~1);
+		long ret = bindings.Score_channel_penalty_msat(this.ptr, short_channel_id, source == null ? 0 : source.ptr, target == null ? 0 : target.ptr, usage == null ? 0 : usage.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(short_channel_id);
 		Reference.reachabilityFence(source);
 		Reference.reachabilityFence(target);
 		Reference.reachabilityFence(usage);
-		this.ptrs_to.add(source);
-		this.ptrs_to.add(target);
+		if (this != null) { this.ptrs_to.add(source); };
+		if (this != null) { this.ptrs_to.add(target); };
+		if (this != null) { this.ptrs_to.add(usage); };
 		return ret;
 	}
 
@@ -154,38 +155,42 @@ public class Score extends CommonBase {
 	 * Handles updating channel penalties after failing to route through a channel.
 	 */
 	public void payment_path_failed(RouteHop[] path, long short_channel_id) {
-		bindings.Score_payment_path_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null, short_channel_id);
+		bindings.Score_payment_path_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null, short_channel_id);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(path);
 		Reference.reachabilityFence(short_channel_id);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
 	}
 
 	/**
 	 * Handles updating channel penalties after successfully routing along a path.
 	 */
 	public void payment_path_successful(RouteHop[] path) {
-		bindings.Score_payment_path_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null);
+		bindings.Score_payment_path_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(path);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
 	}
 
 	/**
 	 * Handles updating channel penalties after a probe over the given path failed.
 	 */
 	public void probe_failed(RouteHop[] path, long short_channel_id) {
-		bindings.Score_probe_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null, short_channel_id);
+		bindings.Score_probe_failed(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null, short_channel_id);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(path);
 		Reference.reachabilityFence(short_channel_id);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
 	}
 
 	/**
 	 * Handles updating channel penalties after a probe over the given path succeeded.
 	 */
 	public void probe_successful(RouteHop[] path) {
-		bindings.Score_probe_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray() : null);
+		bindings.Score_probe_successful(this.ptr, path != null ? Arrays.stream(path).mapToLong(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr).toArray() : null);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(path);
+		for (RouteHop path_conv_10: path) { if (this != null) { this.ptrs_to.add(path_conv_10); }; };
 	}
 
 	/**