X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FShutdown.java;h=4c0e6f4886395cf4c4697c8ff72c970da1690ebe;hb=c6bac88847b7c09560af81f00ba8dd3c2ebe3a19;hp=111511269b4244cb8efcb0472ac3f65891ab6b6e;hpb=592c4f92dd3011a2f2a7988ce66ed166c3a8f58c;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/Shutdown.java b/src/main/java/org/ldk/structs/Shutdown.java
index 11151126..4c0e6f48 100644
--- a/src/main/java/org/ldk/structs/Shutdown.java
+++ b/src/main/java/org/ldk/structs/Shutdown.java
@@ -2,54 +2,93 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * A shutdown message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class Shutdown extends CommonBase {
 	Shutdown(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.Shutdown_free(ptr);
-	}
-
-	public Shutdown(Shutdown orig) {
-		super(bindings.Shutdown_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+		if (ptr != 0) { bindings.Shutdown_free(ptr); }
 	}
 
-	public byte[] get_channel_id(Shutdown this_ptr) {
-		byte[] ret = bindings.Shutdown_get_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The channel ID
+	 */
+	public byte[] get_channel_id() {
+		byte[] ret = bindings.Shutdown_get_channel_id(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_id(Shutdown this_ptr, byte[] val) {
-		bindings.Shutdown_set_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The channel ID
+	 */
+	public void set_channel_id(byte[] val) {
+		bindings.Shutdown_set_channel_id(this.ptr, val);
 	}
 
-	public byte[] get_scriptpubkey(Shutdown this_ptr) {
-		byte[] ret = bindings.Shutdown_get_scriptpubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The destination of this peer's funds on closing.
+	 * Must be in one of these forms: p2pkh, p2sh, p2wpkh, p2wsh.
+	 */
+	public byte[] get_scriptpubkey() {
+		byte[] ret = bindings.Shutdown_get_scriptpubkey(this.ptr);
 		return ret;
 	}
 
-	public void set_scriptpubkey(Shutdown this_ptr, byte[] val) {
-		bindings.Shutdown_set_scriptpubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The destination of this peer's funds on closing.
+	 * Must be in one of these forms: p2pkh, p2sh, p2wpkh, p2wsh.
+	 */
+	public void set_scriptpubkey(byte[] val) {
+		bindings.Shutdown_set_scriptpubkey(this.ptr, val);
+	}
+
+	/**
+	 * Constructs a new Shutdown given each field
+	 */
+	public static Shutdown of(byte[] channel_id_arg, byte[] scriptpubkey_arg) {
+		long ret = bindings.Shutdown_new(channel_id_arg, scriptpubkey_arg);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Shutdown ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new Shutdown(null, ret); }
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
 	}
 
-	public Shutdown(byte[] channel_id_arg, byte[] scriptpubkey_arg) {
-		super(bindings.Shutdown_new(channel_id_arg, scriptpubkey_arg));
+	/**
+	 * Creates a copy of the Shutdown
+	 */
+	public Shutdown clone() {
+		long ret = bindings.Shutdown_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Shutdown ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new Shutdown(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] write(Shutdown obj) {
-		byte[] ret = bindings.Shutdown_write(obj == null ? 0 : obj.ptr & ~1);
-		this.ptrs_to.add(obj);
+	/**
+	 * Serialize the Shutdown object into a byte array which can be read by Shutdown_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.Shutdown_write(this.ptr);
 		return ret;
 	}
 
-	public Shutdown(byte[] ser) {
-		super(bindings.Shutdown_read(ser));
+	/**
+	 * Read a Shutdown from a byte array, created by Shutdown_write
+	 */
+	public static Result_ShutdownDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.Shutdown_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_ShutdownDecodeErrorZ ret_hu_conv = Result_ShutdownDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }