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

diff --git a/src/main/java/org/ldk/structs/PaymentSendFailure.java b/src/main/java/org/ldk/structs/PaymentSendFailure.java
index c87afdf0..8d9ccef3 100644
--- a/src/main/java/org/ldk/structs/PaymentSendFailure.java
+++ b/src/main/java/org/ldk/structs/PaymentSendFailure.java
@@ -44,12 +44,12 @@ public class PaymentSendFailure extends CommonBase {
 	 * once you've changed the parameter at error, you can freely retry the payment in full.
 	 */
 	public final static class ParameterError extends PaymentSendFailure {
-		public final APIError parameter_error;
+		public final org.ldk.structs.APIError parameter_error;
 		private ParameterError(long ptr, bindings.LDKPaymentSendFailure.ParameterError obj) {
 			super(null, ptr);
 			long parameter_error = obj.parameter_error;
-			APIError parameter_error_hu_conv = APIError.constr_from_ptr(parameter_error);
-			parameter_error_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.APIError parameter_error_hu_conv = org.ldk.structs.APIError.constr_from_ptr(parameter_error);
+			if (parameter_error_hu_conv != null) { parameter_error_hu_conv.ptrs_to.add(this); };
 			this.parameter_error = parameter_error_hu_conv;
 		}
 	}
@@ -67,8 +67,9 @@ public class PaymentSendFailure extends CommonBase {
 		private PathParameterError(long ptr, bindings.LDKPaymentSendFailure.PathParameterError obj) {
 			super(null, ptr);
 			long[] path_parameter_error = obj.path_parameter_error;
-			Result_NoneAPIErrorZ[] path_parameter_error_conv_22_arr = new Result_NoneAPIErrorZ[path_parameter_error.length];
-			for (int w = 0; w < path_parameter_error.length; w++) {
+			int path_parameter_error_conv_22_len = path_parameter_error.length;
+			Result_NoneAPIErrorZ[] path_parameter_error_conv_22_arr = new Result_NoneAPIErrorZ[path_parameter_error_conv_22_len];
+			for (int w = 0; w < path_parameter_error_conv_22_len; w++) {
 				long path_parameter_error_conv_22 = path_parameter_error[w];
 				Result_NoneAPIErrorZ path_parameter_error_conv_22_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(path_parameter_error_conv_22);
 				path_parameter_error_conv_22_arr[w] = path_parameter_error_conv_22_hu_conv;
@@ -86,11 +87,12 @@ public class PaymentSendFailure extends CommonBase {
 		private AllFailedRetrySafe(long ptr, bindings.LDKPaymentSendFailure.AllFailedRetrySafe obj) {
 			super(null, ptr);
 			long[] all_failed_retry_safe = obj.all_failed_retry_safe;
-			APIError[] all_failed_retry_safe_conv_10_arr = new APIError[all_failed_retry_safe.length];
-			for (int k = 0; k < all_failed_retry_safe.length; k++) {
+			int all_failed_retry_safe_conv_10_len = all_failed_retry_safe.length;
+			APIError[] all_failed_retry_safe_conv_10_arr = new APIError[all_failed_retry_safe_conv_10_len];
+			for (int k = 0; k < all_failed_retry_safe_conv_10_len; k++) {
 				long all_failed_retry_safe_conv_10 = all_failed_retry_safe[k];
-				APIError all_failed_retry_safe_conv_10_hu_conv = APIError.constr_from_ptr(all_failed_retry_safe_conv_10);
-				all_failed_retry_safe_conv_10_hu_conv.ptrs_to.add(this);
+				org.ldk.structs.APIError all_failed_retry_safe_conv_10_hu_conv = org.ldk.structs.APIError.constr_from_ptr(all_failed_retry_safe_conv_10);
+				if (all_failed_retry_safe_conv_10_hu_conv != null) { all_failed_retry_safe_conv_10_hu_conv.ptrs_to.add(this); };
 				all_failed_retry_safe_conv_10_arr[k] = all_failed_retry_safe_conv_10_hu_conv;
 			}
 			this.all_failed_retry_safe = all_failed_retry_safe_conv_10_arr;
@@ -102,13 +104,13 @@ public class PaymentSendFailure extends CommonBase {
 	 * in over-/re-payment.
 	 * 
 	 * The results here are ordered the same as the paths in the route object which was passed to
-	 * send_payment, and any Errs which are not APIError::MonitorUpdateFailed can be safely
-	 * retried (though there is currently no API with which to do so).
+	 * send_payment, and any `Err`s which are not [`APIError::MonitorUpdateInProgress`] can be
+	 * safely retried via [`ChannelManager::retry_payment`].
 	 * 
-	 * Any entries which contain Err(APIError::MonitorUpdateFailed) or Ok(()) MUST NOT be retried
-	 * as they will result in over-/re-payment. These HTLCs all either successfully sent (in the
-	 * case of Ok(())) or will send once channel_monitor_updated is called on the next-hop channel
-	 * with the latest update_id.
+	 * Any entries which contain `Err(APIError::MonitorUpdateInprogress)` or `Ok(())` MUST NOT be
+	 * retried as they will result in over-/re-payment. These HTLCs all either successfully sent
+	 * (in the case of `Ok(())`) or will send once a [`MonitorEvent::Completed`] is provided for
+	 * the next-hop channel with the latest update_id.
 	 */
 	public final static class PartialFailure extends PaymentSendFailure {
 		/**
@@ -122,7 +124,7 @@ public class PaymentSendFailure extends CommonBase {
 		 * 
 		 * Note that this (or a relevant inner pointer) may be NULL or all-0s to represent None
 		*/
-		@Nullable public final RouteParameters failed_paths_retry;
+		@Nullable public final org.ldk.structs.RouteParameters failed_paths_retry;
 		/**
 		 * The payment id for the payment, which is now at least partially pending.
 		*/
@@ -130,16 +132,17 @@ public class PaymentSendFailure extends CommonBase {
 		private PartialFailure(long ptr, bindings.LDKPaymentSendFailure.PartialFailure obj) {
 			super(null, ptr);
 			long[] results = obj.results;
-			Result_NoneAPIErrorZ[] results_conv_22_arr = new Result_NoneAPIErrorZ[results.length];
-			for (int w = 0; w < results.length; w++) {
+			int results_conv_22_len = results.length;
+			Result_NoneAPIErrorZ[] results_conv_22_arr = new Result_NoneAPIErrorZ[results_conv_22_len];
+			for (int w = 0; w < results_conv_22_len; w++) {
 				long results_conv_22 = results[w];
 				Result_NoneAPIErrorZ results_conv_22_hu_conv = Result_NoneAPIErrorZ.constr_from_ptr(results_conv_22);
 				results_conv_22_arr[w] = results_conv_22_hu_conv;
 			}
 			this.results = results_conv_22_arr;
 			long failed_paths_retry = obj.failed_paths_retry;
-			RouteParameters failed_paths_retry_hu_conv = null; if (failed_paths_retry < 0 || failed_paths_retry > 4096) { failed_paths_retry_hu_conv = new RouteParameters(null, failed_paths_retry); }
-			failed_paths_retry_hu_conv.ptrs_to.add(this);
+			org.ldk.structs.RouteParameters failed_paths_retry_hu_conv = null; if (failed_paths_retry < 0 || failed_paths_retry > 4096) { failed_paths_retry_hu_conv = new org.ldk.structs.RouteParameters(null, failed_paths_retry); }
+			if (failed_paths_retry_hu_conv != null) { failed_paths_retry_hu_conv.ptrs_to.add(this); };
 			this.failed_paths_retry = failed_paths_retry_hu_conv;
 			this.payment_id = obj.payment_id;
 		}
@@ -157,8 +160,8 @@ public class PaymentSendFailure extends CommonBase {
 		long ret = bindings.PaymentSendFailure_clone(this.ptr);
 		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentSendFailure ret_hu_conv = PaymentSendFailure.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(this);
+		org.ldk.structs.PaymentSendFailure ret_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
 		return ret_hu_conv;
 	}
 
@@ -169,8 +172,8 @@ public class PaymentSendFailure extends CommonBase {
 		long ret = bindings.PaymentSendFailure_parameter_error(a.ptr);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentSendFailure ret_hu_conv = PaymentSendFailure.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentSendFailure ret_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -181,8 +184,8 @@ public class PaymentSendFailure extends CommonBase {
 		long ret = bindings.PaymentSendFailure_path_parameter_error(a != null ? Arrays.stream(a).mapToLong(a_conv_22 -> a_conv_22 != null ? a_conv_22.ptr : 0).toArray() : null);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentSendFailure ret_hu_conv = PaymentSendFailure.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentSendFailure ret_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -193,8 +196,8 @@ public class PaymentSendFailure extends CommonBase {
 		long ret = bindings.PaymentSendFailure_all_failed_retry_safe(a != null ? Arrays.stream(a).mapToLong(a_conv_10 -> a_conv_10.ptr).toArray() : null);
 		Reference.reachabilityFence(a);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentSendFailure ret_hu_conv = PaymentSendFailure.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentSendFailure ret_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(ret);
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
 		return ret_hu_conv;
 	}
 
@@ -202,13 +205,14 @@ public class PaymentSendFailure extends CommonBase {
 	 * Utility method to constructs a new PartialFailure-variant PaymentSendFailure
 	 */
 	public static PaymentSendFailure partial_failure(Result_NoneAPIErrorZ[] results, RouteParameters failed_paths_retry, byte[] payment_id) {
-		long ret = bindings.PaymentSendFailure_partial_failure(results != null ? Arrays.stream(results).mapToLong(results_conv_22 -> results_conv_22 != null ? results_conv_22.ptr : 0).toArray() : null, failed_paths_retry == null ? 0 : failed_paths_retry.ptr & ~1, InternalUtils.check_arr_len(payment_id, 32));
+		long ret = bindings.PaymentSendFailure_partial_failure(results != null ? Arrays.stream(results).mapToLong(results_conv_22 -> results_conv_22 != null ? results_conv_22.ptr : 0).toArray() : null, failed_paths_retry == null ? 0 : failed_paths_retry.ptr, InternalUtils.check_arr_len(payment_id, 32));
 		Reference.reachabilityFence(results);
 		Reference.reachabilityFence(failed_paths_retry);
 		Reference.reachabilityFence(payment_id);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		PaymentSendFailure ret_hu_conv = PaymentSendFailure.constr_from_ptr(ret);
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		org.ldk.structs.PaymentSendFailure ret_hu_conv = org.ldk.structs.PaymentSendFailure.constr_from_ptr(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(failed_paths_retry); };
 		return ret_hu_conv;
 	}