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

diff --git a/src/main/java/org/ldk/structs/CommitmentUpdate.java b/src/main/java/org/ldk/structs/CommitmentUpdate.java
index d886689d..dbd15bc6 100644
--- a/src/main/java/org/ldk/structs/CommitmentUpdate.java
+++ b/src/main/java/org/ldk/structs/CommitmentUpdate.java
@@ -2,46 +2,115 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
 
+
+/**
+ * Struct used to return values from revoke_and_ack messages, containing a bunch of commitment
+ * transaction updates if they were pending.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class CommitmentUpdate extends CommonBase {
 	CommitmentUpdate(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		bindings.CommitmentUpdate_free(ptr); super.finalize();
+		super.finalize();
+		if (ptr != 0) { bindings.CommitmentUpdate_free(ptr); }
+	}
+
+	/**
+	 * update_add_htlc messages which should be sent
+	 */
+	public void set_update_add_htlcs(UpdateAddHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_add_htlcs(this.ptr, Arrays.stream(val).mapToLong(val_conv_15 -> val_conv_15 == null ? 0 : val_conv_15.ptr & ~1).toArray());
+		/* TODO 2 UpdateAddHTLC  */;
 	}
 
-	public CommitmentUpdate(CommitmentUpdate orig) {
-		super(bindings.CommitmentUpdate_clone(orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * update_fulfill_htlc messages which should be sent
+	 */
+	public void set_update_fulfill_htlcs(UpdateFulfillHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fulfill_htlcs(this.ptr, Arrays.stream(val).mapToLong(val_conv_19 -> val_conv_19 == null ? 0 : val_conv_19.ptr & ~1).toArray());
+		/* TODO 2 UpdateFulfillHTLC  */;
 	}
 
-	// Skipped CommitmentUpdate_set_update_add_htlcs
-	// Skipped CommitmentUpdate_set_update_fulfill_htlcs
-	// Skipped CommitmentUpdate_set_update_fail_htlcs
-	// Skipped CommitmentUpdate_set_update_fail_malformed_htlcs
-	public UpdateFee get_update_fee(CommitmentUpdate this_ptr) {
-		UpdateFee ret = new UpdateFee(null, bindings.CommitmentUpdate_get_update_fee(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * update_fail_htlc messages which should be sent
+	 */
+	public void set_update_fail_htlcs(UpdateFailHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fail_htlcs(this.ptr, Arrays.stream(val).mapToLong(val_conv_16 -> val_conv_16 == null ? 0 : val_conv_16.ptr & ~1).toArray());
+		/* TODO 2 UpdateFailHTLC  */;
 	}
 
-	public void set_update_fee(CommitmentUpdate this_ptr, UpdateFee val) {
-		bindings.CommitmentUpdate_set_update_fee(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * update_fail_malformed_htlc messages which should be sent
+	 */
+	public void set_update_fail_malformed_htlcs(UpdateFailMalformedHTLC[] val) {
+		bindings.CommitmentUpdate_set_update_fail_malformed_htlcs(this.ptr, Arrays.stream(val).mapToLong(val_conv_25 -> val_conv_25 == null ? 0 : val_conv_25.ptr & ~1).toArray());
+		/* TODO 2 UpdateFailMalformedHTLC  */;
+	}
+
+	/**
+	 * An update_fee message which should be sent
+	 */
+	public UpdateFee get_update_fee() {
+		long ret = bindings.CommitmentUpdate_get_update_fee(this.ptr);
+		UpdateFee ret_hu_conv = new UpdateFee(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * An update_fee message which should be sent
+	 */
+	public void set_update_fee(UpdateFee val) {
+		bindings.CommitmentUpdate_set_update_fee(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
 
-	public CommitmentSigned get_commitment_signed(CommitmentUpdate this_ptr) {
-		CommitmentSigned ret = new CommitmentSigned(null, bindings.CommitmentUpdate_get_commitment_signed(this_ptr.ptr & ~1));
-		this.ptrs_to.add(this_ptr);
-		return ret;
+	/**
+	 * Finally, the commitment_signed message which should be sent
+	 */
+	public CommitmentSigned get_commitment_signed() {
+		long ret = bindings.CommitmentUpdate_get_commitment_signed(this.ptr);
+		CommitmentSigned ret_hu_conv = new CommitmentSigned(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public void set_commitment_signed(CommitmentUpdate this_ptr, CommitmentSigned val) {
-		bindings.CommitmentUpdate_set_commitment_signed(this_ptr.ptr & ~1, val.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Finally, the commitment_signed message which should be sent
+	 */
+	public void set_commitment_signed(CommitmentSigned val) {
+		bindings.CommitmentUpdate_set_commitment_signed(this.ptr, val == null ? 0 : val.ptr & ~1);
 		this.ptrs_to.add(val);
 	}
 
-	// Skipped CommitmentUpdate_new
+	/**
+	 * Constructs a new CommitmentUpdate given each field
+	 */
+	public static CommitmentUpdate of(UpdateAddHTLC[] update_add_htlcs_arg, UpdateFulfillHTLC[] update_fulfill_htlcs_arg, UpdateFailHTLC[] update_fail_htlcs_arg, UpdateFailMalformedHTLC[] update_fail_malformed_htlcs_arg, UpdateFee update_fee_arg, CommitmentSigned commitment_signed_arg) {
+		long ret = bindings.CommitmentUpdate_new(Arrays.stream(update_add_htlcs_arg).mapToLong(update_add_htlcs_arg_conv_15 -> update_add_htlcs_arg_conv_15 == null ? 0 : update_add_htlcs_arg_conv_15.ptr & ~1).toArray(), Arrays.stream(update_fulfill_htlcs_arg).mapToLong(update_fulfill_htlcs_arg_conv_19 -> update_fulfill_htlcs_arg_conv_19 == null ? 0 : update_fulfill_htlcs_arg_conv_19.ptr & ~1).toArray(), Arrays.stream(update_fail_htlcs_arg).mapToLong(update_fail_htlcs_arg_conv_16 -> update_fail_htlcs_arg_conv_16 == null ? 0 : update_fail_htlcs_arg_conv_16.ptr & ~1).toArray(), Arrays.stream(update_fail_malformed_htlcs_arg).mapToLong(update_fail_malformed_htlcs_arg_conv_25 -> update_fail_malformed_htlcs_arg_conv_25 == null ? 0 : update_fail_malformed_htlcs_arg_conv_25.ptr & ~1).toArray(), update_fee_arg == null ? 0 : update_fee_arg.ptr & ~1, commitment_signed_arg == null ? 0 : commitment_signed_arg.ptr & ~1);
+		CommitmentUpdate ret_hu_conv = new CommitmentUpdate(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		/* TODO 2 UpdateAddHTLC  */;
+		/* TODO 2 UpdateFulfillHTLC  */;
+		/* TODO 2 UpdateFailHTLC  */;
+		/* TODO 2 UpdateFailMalformedHTLC  */;
+		ret_hu_conv.ptrs_to.add(update_fee_arg);
+		ret_hu_conv.ptrs_to.add(commitment_signed_arg);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Creates a copy of the CommitmentUpdate
+	 */
+	public CommitmentUpdate clone() {
+		long ret = bindings.CommitmentUpdate_clone(this.ptr);
+		CommitmentUpdate ret_hu_conv = new CommitmentUpdate(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
 }