X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FTxRemoveOutput.java;h=fd6e00da029234e66a255c25b2d917ffd27a150f;hb=HEAD;hp=51c0892be4b01adc3454940afbd475efdb4b6de8;hpb=8fa2bcb208a51fa352d04981f1387d8bceced107;p=ldk-java diff --git a/src/main/java/org/ldk/structs/TxRemoveOutput.java b/src/main/java/org/ldk/structs/TxRemoveOutput.java index 51c0892b..fd6e00da 100644 --- a/src/main/java/org/ldk/structs/TxRemoveOutput.java +++ b/src/main/java/org/ldk/structs/TxRemoveOutput.java @@ -23,19 +23,23 @@ public class TxRemoveOutput extends CommonBase { /** * The channel ID */ - public byte[] get_channel_id() { - byte[] ret = bindings.TxRemoveOutput_get_channel_id(this.ptr); + public ChannelId get_channel_id() { + long ret = bindings.TxRemoveOutput_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; } /** * The channel ID */ - public void set_channel_id(byte[] val) { - bindings.TxRemoveOutput_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + public void set_channel_id(org.ldk.structs.ChannelId val) { + bindings.TxRemoveOutput_set_channel_id(this.ptr, val.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** @@ -59,13 +63,14 @@ public class TxRemoveOutput extends CommonBase { /** * Constructs a new TxRemoveOutput given each field */ - public static TxRemoveOutput of(byte[] channel_id_arg, long serial_id_arg) { - long ret = bindings.TxRemoveOutput_new(InternalUtils.check_arr_len(channel_id_arg, 32), serial_id_arg); + public static TxRemoveOutput of(org.ldk.structs.ChannelId channel_id_arg, long serial_id_arg) { + long ret = bindings.TxRemoveOutput_new(channel_id_arg.ptr, serial_id_arg); Reference.reachabilityFence(channel_id_arg); Reference.reachabilityFence(serial_id_arg); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.TxRemoveOutput ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.TxRemoveOutput(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; } @@ -87,13 +92,25 @@ public class TxRemoveOutput extends CommonBase { return ret_hu_conv; } + /** + * Generates a non-cryptographic 64-bit hash of the TxRemoveOutput. + */ + public long hash() { + long ret = bindings.TxRemoveOutput_hash(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two TxRemoveOutputs 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(org.ldk.structs.TxRemoveOutput b) { - boolean ret = bindings.TxRemoveOutput_eq(this.ptr, b == null ? 0 : b.ptr); + boolean ret = bindings.TxRemoveOutput_eq(this.ptr, b.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(b); if (this != null) { this.ptrs_to.add(b); };