Rewrite the world, with several interdependant changes (but several still WIP)

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

diff --git a/src/main/java/org/ldk/structs/FundingLocked.java b/src/main/java/org/ldk/structs/FundingLocked.java
index ac0cdf239ad93889ba2f41e827356e0000b7dfde..1cf7d7ac492064421b23077d5082af9fd3891da9 100644 (file)
--- a/src/main/java/org/ldk/structs/FundingLocked.java
+++ b/src/main/java/org/ldk/structs/FundingLocked.java
@@ -2,7 +2,10 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class FundingLocked extends CommonBase {
        FundingLocked(Object _dummy, long ptr) { super(ptr); }
        @Override @SuppressWarnings("deprecation")
@@ -11,35 +14,35 @@ public class FundingLocked extends CommonBase {
                bindings.FundingLocked_free(ptr);
        }
 
-       public FundingLocked(FundingLocked orig) {
-               super(bindings.FundingLocked_clone(orig == null ? 0 : orig.ptr & ~1));
-               this.ptrs_to.add(orig);
+       public static FundingLocked constructor_clone(FundingLocked orig) {
+               long ret = bindings.FundingLocked_clone(orig == null ? 0 : orig.ptr & ~1);
+               FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+               ret_hu_conv.ptrs_to.add(orig);
+               return ret_hu_conv;
        }
 
-       public byte[] get_channel_id(FundingLocked this_ptr) {
-               byte[] ret = bindings.FundingLocked_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       public byte[] get_channel_id() {
+               byte[] ret = bindings.FundingLocked_get_channel_id(this.ptr);
                return ret;
        }
 
-       public void set_channel_id(FundingLocked this_ptr, byte[] val) {
-               bindings.FundingLocked_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-               this.ptrs_to.add(this_ptr);
+       public void set_channel_id(byte[] val) {
+               bindings.FundingLocked_set_channel_id(this.ptr, val);
        }
 
-       public byte[] get_next_per_commitment_point(FundingLocked this_ptr) {
-               byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       public byte[] get_next_per_commitment_point() {
+               byte[] ret = bindings.FundingLocked_get_next_per_commitment_point(this.ptr);
                return ret;
        }
 
-       public void set_next_per_commitment_point(FundingLocked this_ptr, byte[] val) {
-               bindings.FundingLocked_set_next_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-               this.ptrs_to.add(this_ptr);
+       public void set_next_per_commitment_point(byte[] val) {
+               bindings.FundingLocked_set_next_per_commitment_point(this.ptr, val);
        }
 
-       public FundingLocked(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
-               super(bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg));
+       public static FundingLocked constructor_new(byte[] channel_id_arg, byte[] next_per_commitment_point_arg) {
+               long ret = bindings.FundingLocked_new(channel_id_arg, next_per_commitment_point_arg);
+               FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+               return ret_hu_conv;
        }
 
        public byte[] write(FundingLocked obj) {
@@ -48,8 +51,10 @@ public class FundingLocked extends CommonBase {
                return ret;
        }
 
-       public FundingLocked(byte[] ser) {
-               super(bindings.FundingLocked_read(ser));
+       public static FundingLocked constructor_read(byte[] ser) {
+               long ret = bindings.FundingLocked_read(ser);
+               FundingLocked ret_hu_conv = new FundingLocked(null, ret);
+               return ret_hu_conv;
        }
 
 }