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

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

diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java
index 9cdbd75f0f93497023cc869e47847aa7f2838d60..412f646ee8ac7a26c7e788b506b4496098b66f32 100644 (file)
--- a/src/main/java/org/ldk/structs/ChannelInfo.java
+++ b/src/main/java/org/ldk/structs/ChannelInfo.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 ChannelInfo extends CommonBase {
        ChannelInfo(Object _dummy, long ptr) { super(ptr); }
        @Override @SuppressWarnings("deprecation")
@@ -11,58 +14,53 @@ public class ChannelInfo extends CommonBase {
                bindings.ChannelInfo_free(ptr);
        }
 
-       public ChannelFeatures get_features(ChannelInfo this_ptr) {
-               ChannelFeatures ret = new ChannelFeatures(null, bindings.ChannelInfo_get_features(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-               this.ptrs_to.add(this_ptr);
-               return ret;
+       public ChannelFeatures get_features() {
+               long ret = bindings.ChannelInfo_get_features(this.ptr);
+               ChannelFeatures ret_hu_conv = new ChannelFeatures(null, ret);
+               return ret_hu_conv;
        }
 
        // Skipped ChannelInfo_set_features
-       public byte[] get_node_one(ChannelInfo this_ptr) {
-               byte[] ret = bindings.ChannelInfo_get_node_one(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       public byte[] get_node_one() {
+               byte[] ret = bindings.ChannelInfo_get_node_one(this.ptr);
                return ret;
        }
 
-       public void set_node_one(ChannelInfo this_ptr, byte[] val) {
-               bindings.ChannelInfo_set_node_one(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-               this.ptrs_to.add(this_ptr);
+       public void set_node_one(byte[] val) {
+               bindings.ChannelInfo_set_node_one(this.ptr, val);
        }
 
-       public DirectionalChannelInfo get_one_to_two(ChannelInfo this_ptr) {
-               DirectionalChannelInfo ret = new DirectionalChannelInfo(null, bindings.ChannelInfo_get_one_to_two(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-               this.ptrs_to.add(this_ptr);
-               return ret;
+       public DirectionalChannelInfo get_one_to_two() {
+               long ret = bindings.ChannelInfo_get_one_to_two(this.ptr);
+               DirectionalChannelInfo ret_hu_conv = new DirectionalChannelInfo(null, ret);
+               return ret_hu_conv;
        }
 
        // Skipped ChannelInfo_set_one_to_two
-       public byte[] get_node_two(ChannelInfo this_ptr) {
-               byte[] ret = bindings.ChannelInfo_get_node_two(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       public byte[] get_node_two() {
+               byte[] ret = bindings.ChannelInfo_get_node_two(this.ptr);
                return ret;
        }
 
-       public void set_node_two(ChannelInfo this_ptr, byte[] val) {
-               bindings.ChannelInfo_set_node_two(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-               this.ptrs_to.add(this_ptr);
+       public void set_node_two(byte[] val) {
+               bindings.ChannelInfo_set_node_two(this.ptr, val);
        }
 
-       public DirectionalChannelInfo get_two_to_one(ChannelInfo this_ptr) {
-               DirectionalChannelInfo ret = new DirectionalChannelInfo(null, bindings.ChannelInfo_get_two_to_one(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-               this.ptrs_to.add(this_ptr);
-               return ret;
+       public DirectionalChannelInfo get_two_to_one() {
+               long ret = bindings.ChannelInfo_get_two_to_one(this.ptr);
+               DirectionalChannelInfo ret_hu_conv = new DirectionalChannelInfo(null, ret);
+               return ret_hu_conv;
        }
 
        // Skipped ChannelInfo_set_two_to_one
-       public ChannelAnnouncement get_announcement_message(ChannelInfo this_ptr) {
-               ChannelAnnouncement ret = new ChannelAnnouncement(null, bindings.ChannelInfo_get_announcement_message(this_ptr == null ? 0 : this_ptr.ptr & ~1));
-               this.ptrs_to.add(this_ptr);
-               return ret;
+       public ChannelAnnouncement get_announcement_message() {
+               long ret = bindings.ChannelInfo_get_announcement_message(this.ptr);
+               ChannelAnnouncement ret_hu_conv = new ChannelAnnouncement(null, ret);
+               return ret_hu_conv;
        }
 
-       public void set_announcement_message(ChannelInfo this_ptr, ChannelAnnouncement val) {
-               bindings.ChannelInfo_set_announcement_message(this_ptr == null ? 0 : this_ptr.ptr & ~1, val == null ? 0 : val.ptr & ~1);
-               this.ptrs_to.add(this_ptr);
+       public void set_announcement_message(ChannelAnnouncement val) {
+               bindings.ChannelInfo_set_announcement_message(this.ptr, val == null ? 0 : val.ptr & ~1);
                this.ptrs_to.add(val);
        }
 
@@ -72,8 +70,10 @@ public class ChannelInfo extends CommonBase {
                return ret;
        }
 
-       public ChannelInfo(byte[] ser) {
-               super(bindings.ChannelInfo_read(ser));
+       public static ChannelInfo constructor_read(byte[] ser) {
+               long ret = bindings.ChannelInfo_read(ser);
+               ChannelInfo ret_hu_conv = new ChannelInfo(null, ret);
+               return ret_hu_conv;
        }
 
 }