X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAPIError.java;h=48152a61b9312c492ca6a168f29ad893ebb55436;hb=a7653cf8717b1f9df4d3f4c4bd0b1f50f3bbc230;hp=40704400b512c24e6e696f568d1ede5de3826a1e;hpb=371e82300e5de678404f0addc47a20636077df5d;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/APIError.java b/src/main/java/org/ldk/structs/APIError.java
index 40704400..48152a61 100644
--- a/src/main/java/org/ldk/structs/APIError.java
+++ b/src/main/java/org/ldk/structs/APIError.java
@@ -4,16 +4,21 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * Indicates an error on the client's part (usually some variant of attempting to use too-low or
+ * too-high values)
+ */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class APIError extends CommonBase {
 	private APIError(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.APIError_free(ptr);
+		if (ptr != 0) { bindings.APIError_free(ptr); }
 	}
-	long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
 	static APIError constr_from_ptr(long ptr) {
 		bindings.LDKAPIError raw_val = bindings.LDKAPIError_ref_from_ptr(ptr);
 		if (raw_val.getClass() == bindings.LDKAPIError.APIMisuseError.class) {
@@ -31,47 +36,151 @@ public class APIError extends CommonBase {
 		if (raw_val.getClass() == bindings.LDKAPIError.MonitorUpdateFailed.class) {
 			return new MonitorUpdateFailed(ptr, (bindings.LDKAPIError.MonitorUpdateFailed)raw_val);
 		}
+		if (raw_val.getClass() == bindings.LDKAPIError.IncompatibleShutdownScript.class) {
+			return new IncompatibleShutdownScript(ptr, (bindings.LDKAPIError.IncompatibleShutdownScript)raw_val);
+		}
 		assert false; return null; // Unreachable without extending the (internal) bindings interface
 	}
 
 	public final static class APIMisuseError extends APIError {
-		public byte[] err;
+		/**
+		 * A human-readable error message
+		*/
+		public final String err;
 		private APIMisuseError(long ptr, bindings.LDKAPIError.APIMisuseError obj) {
 			super(null, ptr);
 			this.err = obj.err;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class FeeRateTooHigh extends APIError {
-		public byte[] err;
-		public int feerate;
+		/**
+		 * A human-readable error message
+		*/
+		public final String err;
+		/**
+		 * The feerate which was too high.
+		*/
+		public final int feerate;
 		private FeeRateTooHigh(long ptr, bindings.LDKAPIError.FeeRateTooHigh obj) {
 			super(null, ptr);
 			this.err = obj.err;
 			this.feerate = obj.feerate;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class RouteError extends APIError {
-		public String err;
+		/**
+		 * A human-readable error message
+		*/
+		public final String err;
 		private RouteError(long ptr, bindings.LDKAPIError.RouteError obj) {
 			super(null, ptr);
 			this.err = obj.err;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class ChannelUnavailable extends APIError {
-		public byte[] err;
+		/**
+		 * A human-readable error message
+		*/
+		public final String err;
 		private ChannelUnavailable(long ptr, bindings.LDKAPIError.ChannelUnavailable obj) {
 			super(null, ptr);
 			this.err = obj.err;
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
 	public final static class MonitorUpdateFailed extends APIError {
 		private MonitorUpdateFailed(long ptr, bindings.LDKAPIError.MonitorUpdateFailed obj) {
 			super(null, ptr);
 		}
-		@Override long conv_to_c() { return 0; /*XXX*/ }
 	}
+	public final static class IncompatibleShutdownScript extends APIError {
+		/**
+		 * The incompatible shutdown script.
+		*/
+		public final ShutdownScript script;
+		private IncompatibleShutdownScript(long ptr, bindings.LDKAPIError.IncompatibleShutdownScript obj) {
+			super(null, ptr);
+			long script = obj.script;
+			ShutdownScript script_hu_conv = new ShutdownScript(null, script);
+			script_hu_conv.ptrs_to.add(this);
+			this.script = script_hu_conv;
+		}
+	}
+	/**
+	 * Creates a copy of the APIError
+	 */
+	public APIError clone() {
+		long ret = bindings.APIError_clone(this.ptr);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new APIMisuseError-variant APIError
+	 */
+	public static APIError apimisuse_error(java.lang.String err) {
+		long ret = bindings.APIError_apimisuse_error(err);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new FeeRateTooHigh-variant APIError
+	 */
+	public static APIError fee_rate_too_high(java.lang.String err, int feerate) {
+		long ret = bindings.APIError_fee_rate_too_high(err, feerate);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new RouteError-variant APIError
+	 */
+	public static APIError route_error(java.lang.String err) {
+		long ret = bindings.APIError_route_error(err);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new ChannelUnavailable-variant APIError
+	 */
+	public static APIError channel_unavailable(java.lang.String err) {
+		long ret = bindings.APIError_channel_unavailable(err);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new MonitorUpdateFailed-variant APIError
+	 */
+	public static APIError monitor_update_failed() {
+		long ret = bindings.APIError_monitor_update_failed();
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Utility method to constructs a new IncompatibleShutdownScript-variant APIError
+	 */
+	public static APIError incompatible_shutdown_script(ShutdownScript script) {
+		long ret = bindings.APIError_incompatible_shutdown_script(script == null ? 0 : script.ptr & ~1);
+		if (ret < 1024) { return null; }
+		APIError ret_hu_conv = APIError.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(script);
+		return ret_hu_conv;
+	}
+
 }