X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FTxComplete.java;h=46cf83a0b002dac2683180e6e0177e7fa928fb60;hb=ffdd56c967087cba7548599934585b8a9a3102e2;hp=1c80c723c5d981a81b072572914e817e8c1d9553;hpb=8fa2bcb208a51fa352d04981f1387d8bceced107;p=ldk-java diff --git a/src/main/java/org/ldk/structs/TxComplete.java b/src/main/java/org/ldk/structs/TxComplete.java index 1c80c723..46cf83a0 100644 --- a/src/main/java/org/ldk/structs/TxComplete.java +++ b/src/main/java/org/ldk/structs/TxComplete.java @@ -24,30 +24,35 @@ public class TxComplete extends CommonBase { /** * The channel ID */ - public byte[] get_channel_id() { - byte[] ret = bindings.TxComplete_get_channel_id(this.ptr); + public ChannelId get_channel_id() { + long ret = bindings.TxComplete_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.TxComplete_set_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32)); + public void set_channel_id(org.ldk.structs.ChannelId val) { + bindings.TxComplete_set_channel_id(this.ptr, val.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(val); + if (this != null) { this.ptrs_to.add(val); }; } /** * Constructs a new TxComplete given each field */ - public static TxComplete of(byte[] channel_id_arg) { - long ret = bindings.TxComplete_new(InternalUtils.check_arr_len(channel_id_arg, 32)); + public static TxComplete of(org.ldk.structs.ChannelId channel_id_arg) { + long ret = bindings.TxComplete_new(channel_id_arg.ptr); Reference.reachabilityFence(channel_id_arg); if (ret >= 0 && ret <= 4096) { return null; } org.ldk.structs.TxComplete ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.TxComplete(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; } @@ -69,13 +74,25 @@ public class TxComplete extends CommonBase { return ret_hu_conv; } + /** + * Generates a non-cryptographic 64-bit hash of the TxComplete. + */ + public long hash() { + long ret = bindings.TxComplete_hash(this.ptr); + Reference.reachabilityFence(this); + return ret; + } + + @Override public int hashCode() { + return (int)this.hash(); + } /** * Checks if two TxCompletes 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.TxComplete b) { - boolean ret = bindings.TxComplete_eq(this.ptr, b == null ? 0 : b.ptr); + boolean ret = bindings.TxComplete_eq(this.ptr, b.ptr); Reference.reachabilityFence(this); Reference.reachabilityFence(b); if (this != null) { this.ptrs_to.add(b); };