Provide human versions of trait interfaces, with a bunch of fixes to make it work

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

diff --git a/src/main/java/org/ldk/structs/NetAddress.java b/src/main/java/org/ldk/structs/NetAddress.java
index 32e333f2fb7982adbb432421ebd32036bcfed1c7..6dd3708a36acd2378b8bd0a49d31f6a609cb2120 100644 (file)
--- a/src/main/java/org/ldk/structs/NetAddress.java
+++ b/src/main/java/org/ldk/structs/NetAddress.java
@@ -11,9 +11,8 @@ public class NetAddress extends CommonBase {
        @Override @SuppressWarnings("deprecation")
        protected void finalize() throws Throwable {
                super.finalize();
-               bindings.NetAddress_free(ptr);
+               if (ptr != 0) { bindings.NetAddress_free(ptr); }
        }
-       long conv_to_c() { assert false; return 0; /* Should only be called on subclasses */ }
        static NetAddress constr_from_ptr(long ptr) {
                bindings.LDKNetAddress raw_val = bindings.LDKNetAddress_ref_from_ptr(ptr);
                if (raw_val.getClass() == bindings.LDKNetAddress.IPv4.class) {
@@ -32,40 +31,37 @@ public class NetAddress extends CommonBase {
        }
 
        public final static class IPv4 extends NetAddress {
-               public byte[] addr;
-               public short port;
+               public final byte[] addr;
+               public final short port;
                private IPv4(long ptr, bindings.LDKNetAddress.IPv4 obj) {
                        super(null, ptr);
                        this.addr = obj.addr;
                        this.port = obj.port;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
        public final static class IPv6 extends NetAddress {
-               public byte[] addr;
-               public short port;
+               public final byte[] addr;
+               public final short port;
                private IPv6(long ptr, bindings.LDKNetAddress.IPv6 obj) {
                        super(null, ptr);
                        this.addr = obj.addr;
                        this.port = obj.port;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
        public final static class OnionV2 extends NetAddress {
-               public byte[] addr;
-               public short port;
+               public final byte[] addr;
+               public final short port;
                private OnionV2(long ptr, bindings.LDKNetAddress.OnionV2 obj) {
                        super(null, ptr);
                        this.addr = obj.addr;
                        this.port = obj.port;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
        public final static class OnionV3 extends NetAddress {
-               public byte[] ed25519_pubkey;
-               public short checksum;
-               public byte version;
-               public short port;
+               public final byte[] ed25519_pubkey;
+               public final short checksum;
+               public final byte version;
+               public final short port;
                private OnionV3(long ptr, bindings.LDKNetAddress.OnionV3 obj) {
                        super(null, ptr);
                        this.ed25519_pubkey = obj.ed25519_pubkey;
@@ -73,6 +69,5 @@ public class NetAddress extends CommonBase {
                        this.version = obj.version;
                        this.port = obj.port;
                }
-               @Override long conv_to_c() { return 0; /*XXX*/ }
        }
 }