[Java] Update auto-generated Java structs

[ldk-java] / src / main / java / org / ldk / structs / Payer.java

diff --git a/src/main/java/org/ldk/structs/Payer.java b/src/main/java/org/ldk/structs/Payer.java
index 2af7e3e732d7e44178d562a44959c457de0ca9e4..8cefcd05599d3a8a8aeace480ef7a9474b95547e 100644 (file)
--- a/src/main/java/org/ldk/structs/Payer.java
+++ b/src/main/java/org/ldk/structs/Payer.java
@@ -58,34 +58,40 @@ public class Payer extends CommonBase {
                impl_holder.held = new Payer(new bindings.LDKPayer() {
                        @Override public byte[] node_id() {
                                byte[] ret = arg.node_id();
+                               Reference.reachabilityFence(arg);
                                byte[] result = InternalUtils.check_arr_len(ret, 33);
                                return result;
                        }
                        @Override public long[] first_hops() {
                                ChannelDetails[] ret = arg.first_hops();
+                               Reference.reachabilityFence(arg);
                                long[] result = ret != null ? Arrays.stream(ret).mapToLong(ret_conv_16 -> ret_conv_16 == null ? 0 : ret_conv_16.clone_ptr()).toArray() : null;
                                return result;
                        }
                        @Override public long send_payment(long route, byte[] payment_hash, byte[] payment_secret) {
-                               Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
+                               org.ldk.structs.Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new org.ldk.structs.Route(null, route); }
                                Result_PaymentIdPaymentSendFailureZ ret = arg.send_payment(route_hu_conv, payment_hash, payment_secret);
+                               Reference.reachabilityFence(arg);
                                long result = ret == null ? 0 : ret.clone_ptr();
                                return result;
                        }
                        @Override public long send_spontaneous_payment(long route, byte[] payment_preimage) {
-                               Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
+                               org.ldk.structs.Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new org.ldk.structs.Route(null, route); }
                                Result_PaymentIdPaymentSendFailureZ ret = arg.send_spontaneous_payment(route_hu_conv, payment_preimage);
+                               Reference.reachabilityFence(arg);
                                long result = ret == null ? 0 : ret.clone_ptr();
                                return result;
                        }
                        @Override public long retry_payment(long route, byte[] payment_id) {
-                               Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new Route(null, route); }
+                               org.ldk.structs.Route route_hu_conv = null; if (route < 0 || route > 4096) { route_hu_conv = new org.ldk.structs.Route(null, route); }
                                Result_NonePaymentSendFailureZ ret = arg.retry_payment(route_hu_conv, payment_id);
+                               Reference.reachabilityFence(arg);
                                long result = ret == null ? 0 : ret.clone_ptr();
                                return result;
                        }
                        @Override public void abandon_payment(byte[] payment_id) {
                                arg.abandon_payment(payment_id);
+                               Reference.reachabilityFence(arg);
                        }
                });
                return impl_holder.held;
@@ -105,11 +111,12 @@ public class Payer extends CommonBase {
        public ChannelDetails[] first_hops() {
                long[] ret = bindings.Payer_first_hops(this.ptr);
                Reference.reachabilityFence(this);
-               ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret.length];
-               for (int q = 0; q < ret.length; q++) {
+               int ret_conv_16_len = ret.length;
+               ChannelDetails[] ret_conv_16_arr = new ChannelDetails[ret_conv_16_len];
+               for (int q = 0; q < ret_conv_16_len; q++) {
                        long ret_conv_16 = ret[q];
-                       ChannelDetails ret_conv_16_hu_conv = null; if (ret_conv_16 < 0 || ret_conv_16 > 4096) { ret_conv_16_hu_conv = new ChannelDetails(null, ret_conv_16); }
-                       ret_conv_16_hu_conv.ptrs_to.add(this);
+                       org.ldk.structs.ChannelDetails ret_conv_16_hu_conv = null; if (ret_conv_16 < 0 || ret_conv_16 > 4096) { ret_conv_16_hu_conv = new org.ldk.structs.ChannelDetails(null, ret_conv_16); }
+                       if (ret_conv_16_hu_conv != null) { ret_conv_16_hu_conv.ptrs_to.add(this); };
                        ret_conv_16_arr[q] = ret_conv_16_hu_conv;
                }
                return ret_conv_16_arr;
@@ -121,14 +128,14 @@ public class Payer extends CommonBase {
         * Note that payment_secret (or a relevant inner pointer) may be NULL or all-0s to represent None
         */
        public Result_PaymentIdPaymentSendFailureZ send_payment(Route route, byte[] payment_hash, @Nullable byte[] payment_secret) {
-               long ret = bindings.Payer_send_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_hash, 32), InternalUtils.check_arr_len(payment_secret, 32));
+               long ret = bindings.Payer_send_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_hash, 32), InternalUtils.check_arr_len(payment_secret, 32));
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(route);
                Reference.reachabilityFence(payment_hash);
                Reference.reachabilityFence(payment_secret);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_PaymentIdPaymentSendFailureZ ret_hu_conv = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret);
-               this.ptrs_to.add(route);
+               if (this != null) { this.ptrs_to.add(route); };
                return ret_hu_conv;
        }
 
@@ -136,13 +143,13 @@ public class Payer extends CommonBase {
         * Sends a spontaneous payment over the Lightning Network using the given [`Route`].
         */
        public Result_PaymentIdPaymentSendFailureZ send_spontaneous_payment(Route route, byte[] payment_preimage) {
-               long ret = bindings.Payer_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_preimage, 32));
+               long ret = bindings.Payer_send_spontaneous_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_preimage, 32));
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(route);
                Reference.reachabilityFence(payment_preimage);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_PaymentIdPaymentSendFailureZ ret_hu_conv = Result_PaymentIdPaymentSendFailureZ.constr_from_ptr(ret);
-               this.ptrs_to.add(route);
+               if (this != null) { this.ptrs_to.add(route); };
                return ret_hu_conv;
        }
 
@@ -150,13 +157,13 @@ public class Payer extends CommonBase {
         * Retries a failed payment path for the [`PaymentId`] using the given [`Route`].
         */
        public Result_NonePaymentSendFailureZ retry_payment(Route route, byte[] payment_id) {
-               long ret = bindings.Payer_retry_payment(this.ptr, route == null ? 0 : route.ptr & ~1, InternalUtils.check_arr_len(payment_id, 32));
+               long ret = bindings.Payer_retry_payment(this.ptr, route == null ? 0 : route.ptr, InternalUtils.check_arr_len(payment_id, 32));
                Reference.reachabilityFence(this);
                Reference.reachabilityFence(route);
                Reference.reachabilityFence(payment_id);
                if (ret >= 0 && ret <= 4096) { return null; }
                Result_NonePaymentSendFailureZ ret_hu_conv = Result_NonePaymentSendFailureZ.constr_from_ptr(ret);
-               this.ptrs_to.add(route);
+               if (this != null) { this.ptrs_to.add(route); };
                return ret_hu_conv;
        }