X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FChannelInfo.java;h=ae95717da10252fb50c30bbb0a35c9b3734231f2;hb=76b59fb93494e68d9b02d204c9ed9a153c73dd9b;hp=eee871e351c0c3e1a5304b9571fd0ce22a335c40;hpb=3d559f3266fde7c6a21248c10d9a7145125b5e69;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ChannelInfo.java b/src/main/java/org/ldk/structs/ChannelInfo.java
index eee871e3..ae95717d 100644
--- a/src/main/java/org/ldk/structs/ChannelInfo.java
+++ b/src/main/java/org/ldk/structs/ChannelInfo.java
@@ -2,84 +2,78 @@ 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.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(ChannelInfo this_ptr, ChannelFeatures val) {
-		bindings.ChannelInfo_set_features(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
-	}
-
-	public byte[] get_node_one(ChannelInfo this_ptr) {
-		byte[] ret = bindings.ChannelInfo_get_node_one(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	// Skipped ChannelInfo_set_features
+	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.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.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(ChannelInfo this_ptr, DirectionalChannelInfo val) {
-		bindings.ChannelInfo_set_one_to_two(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	// Skipped ChannelInfo_set_one_to_two
+	public byte[] get_node_two() {
+		byte[] ret = bindings.ChannelInfo_get_node_two(this.ptr);
+		return ret;
 	}
 
-	public byte[] get_node_two(ChannelInfo this_ptr) {
-		byte[] ret = bindings.ChannelInfo_get_node_two(this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	public void set_node_two(byte[] val) {
+		bindings.ChannelInfo_set_node_two(this.ptr, val);
 	}
 
-	public void set_node_two(ChannelInfo this_ptr, byte[] val) {
-		bindings.ChannelInfo_set_node_two(this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	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;
 	}
 
-	public DirectionalChannelInfo get_two_to_one(ChannelInfo this_ptr) {
-		DirectionalChannelInfo ret = new DirectionalChannelInfo(null, bindings.ChannelInfo_get_two_to_one(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	// Skipped ChannelInfo_set_two_to_one
+	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_two_to_one(ChannelInfo this_ptr, DirectionalChannelInfo val) {
-		bindings.ChannelInfo_set_two_to_one(this_ptr.ptr & ~1, 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);
 	}
 
-	public ChannelAnnouncement get_announcement_message(ChannelInfo this_ptr) {
-		ChannelAnnouncement ret = new ChannelAnnouncement(null, bindings.ChannelInfo_get_announcement_message(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
+	public byte[] write(ChannelInfo obj) {
+		byte[] ret = bindings.ChannelInfo_write(obj == null ? 0 : obj.ptr & ~1);
+		this.ptrs_to.add(obj);
 		return ret;
 	}
 
-	public void set_announcement_message(ChannelInfo this_ptr, ChannelAnnouncement val) {
-		bindings.ChannelInfo_set_announcement_message(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
-		this.ptrs_to.add(val);
+	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;
 	}
 
-	// Skipped ChannelInfo_write
-	// Skipped ChannelInfo_read
 }