Merge pull request #50 from TheBlueMatt/main

[ldk-java] / src / main / java / org / ldk / structs / Filter.java

diff --git a/src/main/java/org/ldk/structs/Filter.java b/src/main/java/org/ldk/structs/Filter.java
index 9200d9a14311e47e9fb8e5ba4dd49d3bf3651d76..1225210dd64eda8b85887a0b7a51750cb7445ecc 100644 (file)
--- a/src/main/java/org/ldk/structs/Filter.java
+++ b/src/main/java/org/ldk/structs/Filter.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 /**
  * The `Filter` trait defines behavior for indicating chain activity of interest pertaining to
@@ -23,7 +24,7 @@ import java.util.Arrays;
  * processed later. Then, in order to block until the data has been processed, any [`Watch`]
  * invocation that has called the `Filter` must return [`TemporaryFailure`].
  * 
- * [`TemporaryFailure`]: channelmonitor::ChannelMonitorUpdateErr::TemporaryFailure
+ * [`TemporaryFailure`]: ChannelMonitorUpdateErr::TemporaryFailure
  * [BIP 157]: https://github.com/bitcoin/bips/blob/master/bip-0157.mediawiki
  * [BIP 158]: https://github.com/bitcoin/bips/blob/master/bip-0158.mediawiki
  */
@@ -96,11 +97,11 @@ public class Filter extends CommonBase {
         * such descendant transactions were already included (e.g., when a BIP 157 client provides the
         * full block).
         */
-       public Option_C2Tuple_usizeTransactionZZ register_output(byte[] output_block_hash_arg, OutPoint output_outpoint_arg, byte[] output_script_pubkey_arg) {
-               long ret = bindings.Filter_register_output(this.ptr, bindings.WatchedOutput_new(output_block_hash_arg, output_outpoint_arg == null ? 0 : output_outpoint_arg.ptr & ~1, output_script_pubkey_arg));
+       public Option_C2Tuple_usizeTransactionZZ register_output(WatchedOutput output) {
+               long ret = bindings.Filter_register_output(this.ptr, output == null ? 0 : output.ptr & ~1);
+               if (ret >= 0 && ret < 1024) { return null; }
                Option_C2Tuple_usizeTransactionZZ ret_hu_conv = Option_C2Tuple_usizeTransactionZZ.constr_from_ptr(ret);
                ret_hu_conv.ptrs_to.add(this);
-               ret_hu_conv.ptrs_to.add(output_outpoint_arg);
                return ret_hu_conv;
        }