X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FErrorMessage.java;h=77880a9fe229ec7d6de135fd08c7abd74c1aa3a8;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=18a4d4bde5633dc39e4a83155db25e1d8e09344f;hpb=0de4267b2f4dd9a0b2b2dfab7efc788887894a33;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/ErrorMessage.java b/src/main/java/org/ldk/structs/ErrorMessage.java
index 18a4d4bd..77880a9f 100644
--- a/src/main/java/org/ldk/structs/ErrorMessage.java
+++ b/src/main/java/org/ldk/structs/ErrorMessage.java
@@ -9,7 +9,9 @@ import javax.annotation.Nullable;
 
 
 /**
- * An error message to be sent or received from a peer
+ * An [`error`] message to be sent to or received from a peer.
+ * 
+ * [`error`]: https://github.com/lightning/bolts/blob/master/01-messaging.md#the-error-and-warning-messages
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class ErrorMessage extends CommonBase {
@@ -26,10 +28,13 @@ public class ErrorMessage extends CommonBase {
 	 * All-0s indicates a general error unrelated to a specific channel, after which all channels
 	 * with the sending peer should be closed.
 	 */
-	public byte[] get_channel_id() {
-		byte[] ret = bindings.ErrorMessage_get_channel_id(this.ptr);
+	public ChannelId get_channel_id() {
+		long ret = bindings.ErrorMessage_get_channel_id(this.ptr);
 		Reference.reachabilityFence(this);
-		return ret;
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelId ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelId(null, ret); }
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(this); };
+		return ret_hu_conv;
 	}
 
 	/**
@@ -38,16 +43,18 @@ public class ErrorMessage extends CommonBase {
 	 * All-0s indicates a general error unrelated to a specific channel, after which all channels
 	 * with the sending peer should be closed.
 	 */
-	public void set_channel_id(byte[] val) {
-		bindings.ErrorMessage_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+	public void set_channel_id(org.ldk.structs.ChannelId val) {
+		bindings.ErrorMessage_set_channel_id(this.ptr, val.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(val);
+		if (this != null) { this.ptrs_to.add(val); };
 	}
 
 	/**
 	 * A possibly human-readable error description.
-	 * The string should be sanitized before it is used (e.g. emitted to logs or printed to
-	 * stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
+	 * 
+	 * The string should be sanitized before it is used (e.g., emitted to logs or printed to
+	 * `stdout`). Otherwise, a well crafted error message may trigger a security vulnerability in
 	 * the terminal emulator or the logging subsystem.
 	 */
 	public String get_data() {
@@ -58,8 +65,9 @@ public class ErrorMessage extends CommonBase {
 
 	/**
 	 * A possibly human-readable error description.
-	 * The string should be sanitized before it is used (e.g. emitted to logs or printed to
-	 * stdout). Otherwise, a well crafted error message may trigger a security vulnerability in
+	 * 
+	 * The string should be sanitized before it is used (e.g., emitted to logs or printed to
+	 * `stdout`). Otherwise, a well crafted error message may trigger a security vulnerability in
 	 * the terminal emulator or the logging subsystem.
 	 */
 	public void set_data(java.lang.String val) {
@@ -71,13 +79,14 @@ public class ErrorMessage extends CommonBase {
 	/**
 	 * Constructs a new ErrorMessage given each field
 	 */
-	public static ErrorMessage of(byte[] channel_id_arg, java.lang.String data_arg) {
-		long ret = bindings.ErrorMessage_new(InternalUtils.check_arr_len(channel_id_arg, 32), data_arg);
+	public static ErrorMessage of(org.ldk.structs.ChannelId channel_id_arg, java.lang.String data_arg) {
+		long ret = bindings.ErrorMessage_new(channel_id_arg.ptr, data_arg);
 		Reference.reachabilityFence(channel_id_arg);
 		Reference.reachabilityFence(data_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ErrorMessage ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ErrorMessage(null, ret); }
 		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(ret_hu_conv); };
+		if (ret_hu_conv != null) { ret_hu_conv.ptrs_to.add(channel_id_arg); };
 		return ret_hu_conv;
 	}
 
@@ -99,13 +108,25 @@ public class ErrorMessage extends CommonBase {
 		return ret_hu_conv;
 	}
 
+	/**
+	 * Generates a non-cryptographic 64-bit hash of the ErrorMessage.
+	 */
+	public long hash() {
+		long ret = bindings.ErrorMessage_hash(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
+	}
+
+	@Override public int hashCode() {
+		return (int)this.hash();
+	}
 	/**
 	 * Checks if two ErrorMessages contain equal inner contents.
 	 * This ignores pointers and is_owned flags and looks at the values in fields.
 	 * Two objects with NULL inner values will be considered "equal" here.
 	 */
-	public boolean eq(ErrorMessage b) {
-		boolean ret = bindings.ErrorMessage_eq(this.ptr, b == null ? 0 : b.ptr);
+	public boolean eq(org.ldk.structs.ErrorMessage b) {
+		boolean ret = bindings.ErrorMessage_eq(this.ptr, b.ptr);
 		Reference.reachabilityFence(this);
 		Reference.reachabilityFence(b);
 		if (this != null) { this.ptrs_to.add(b); };