X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;h=fdcba395d968d19debb505aad88c75b33f276da7;hb=1863ccdb8d571b431fa6e99b1cd2dd5963df1d16;hp=b0de8cbede3f1c43d5372b065f58777e294dde28;hpb=de28908caacda7226bac70837a33cfe6e16417ab;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java
index b0de8cbe..fdcba395 100644
--- a/src/main/java/org/ldk/structs/ChannelInfo.java
+++ b/src/main/java/org/ldk/structs/ChannelInfo.java
@@ -2,72 +2,89 @@ 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")
 	protected void finalize() throws Throwable {
-		bindings.ChannelInfo_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { 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;
+	}
+
+	public void set_features(ChannelFeatures val) {
+		bindings.ChannelInfo_set_features(this.ptr, val == null ? 0 : val.ptr & ~1);
+		this.ptrs_to.add(val);
 	}
 
-	// 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;
+	}
+
+	public void set_one_to_two(DirectionalChannelInfo val) {
+		bindings.ChannelInfo_set_one_to_two(this.ptr, val == null ? 0 : val.ptr & ~1);
+		this.ptrs_to.add(val);
 	}
 
-	// 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 void set_two_to_one(DirectionalChannelInfo val) {
+		bindings.ChannelInfo_set_two_to_one(this.ptr, val == null ? 0 : val.ptr & ~1);
+		this.ptrs_to.add(val);
+	}
+
+	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);
 	}
 
-	// Skipped ChannelInfo_write
-	public ChannelInfo(byte[] ser) {
-		super(bindings.ChannelInfo_read(ser));
+	public byte[] write() {
+		byte[] ret = bindings.ChannelInfo_write(this.ptr);
+		return ret;
+	}
+
+	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;
 	}
 
 }