Merge pull request #2 from TheBlueMatt/main

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

diff --git a/src/main/java/org/ldk/structs/ChannelMessageHandler.java b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
index 060133855ae1117c56add57e5cf0a659e0bf9cdf..2b9aebe4680264b50744ed174afee298448ee6a4 100644 (file)
--- a/src/main/java/org/ldk/structs/ChannelMessageHandler.java
+++ b/src/main/java/org/ldk/structs/ChannelMessageHandler.java
@@ -26,7 +26,7 @@ public class ChannelMessageHandler extends CommonBase {
                void handle_funding_created(byte[] their_node_id, FundingCreated msg);
                void handle_funding_signed(byte[] their_node_id, FundingSigned msg);
                void handle_funding_locked(byte[] their_node_id, FundingLocked msg);
-               void handle_shutdown(byte[] their_node_id, Shutdown msg);
+               void handle_shutdown(byte[] their_node_id, InitFeatures their_features, Shutdown msg);
                void handle_closing_signed(byte[] their_node_id, ClosingSigned msg);
                void handle_update_add_htlc(byte[] their_node_id, UpdateAddHTLC msg);
                void handle_update_fulfill_htlc(byte[] their_node_id, UpdateFulfillHTLC msg);
@@ -69,9 +69,10 @@ public class ChannelMessageHandler extends CommonBase {
                                FundingLocked msg_hu_conv = new FundingLocked(null, msg);
                                arg.handle_funding_locked(their_node_id, msg_hu_conv);
                        }
-                       @Override public void handle_shutdown(byte[] their_node_id, long msg) {
+                       @Override public void handle_shutdown(byte[] their_node_id, long their_features, long msg) {
+                               InitFeatures their_features_hu_conv = new InitFeatures(null, their_features);
                                Shutdown msg_hu_conv = new Shutdown(null, msg);
-                               arg.handle_shutdown(their_node_id, msg_hu_conv);
+                               arg.handle_shutdown(their_node_id, their_features_hu_conv, msg_hu_conv);
                        }
                        @Override public void handle_closing_signed(byte[] their_node_id, long msg) {
                                ClosingSigned msg_hu_conv = new ClosingSigned(null, msg);
@@ -130,28 +131,12 @@ public class ChannelMessageHandler extends CommonBase {
        public void handle_open_channel(byte[] their_node_id, InitFeatures their_features, OpenChannel msg) {
                bindings.ChannelMessageHandler_handle_open_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
                this.ptrs_to.add(their_features);
-               // Due to rust's strict-ownership memory model, in some cases we need to "move"
-               // an object to pass exclusive ownership to the function being called.
-               // In most cases, we avoid this being visible in GC'd languages by cloning the object
-               // at the FFI layer, creating a new object which Rust can claim ownership of
-               // However, in some cases (eg here), there is no way to clone an object, and thus
-               // we actually have to pass full ownership to Rust.
-               // Thus, after this call, their_features is reset to null and is now a dummy object.
-               their_features.ptr = 0;
                this.ptrs_to.add(msg);
        }
 
        public void handle_accept_channel(byte[] their_node_id, InitFeatures their_features, AcceptChannel msg) {
                bindings.ChannelMessageHandler_handle_accept_channel(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
                this.ptrs_to.add(their_features);
-               // Due to rust's strict-ownership memory model, in some cases we need to "move"
-               // an object to pass exclusive ownership to the function being called.
-               // In most cases, we avoid this being visible in GC'd languages by cloning the object
-               // at the FFI layer, creating a new object which Rust can claim ownership of
-               // However, in some cases (eg here), there is no way to clone an object, and thus
-               // we actually have to pass full ownership to Rust.
-               // Thus, after this call, their_features is reset to null and is now a dummy object.
-               their_features.ptr = 0;
                this.ptrs_to.add(msg);
        }
 
@@ -170,8 +155,9 @@ public class ChannelMessageHandler extends CommonBase {
                this.ptrs_to.add(msg);
        }
 
-       public void handle_shutdown(byte[] their_node_id, Shutdown msg) {
-               bindings.ChannelMessageHandler_handle_shutdown(this.ptr, their_node_id, msg == null ? 0 : msg.ptr & ~1);
+       public void handle_shutdown(byte[] their_node_id, InitFeatures their_features, Shutdown msg) {
+               bindings.ChannelMessageHandler_handle_shutdown(this.ptr, their_node_id, their_features == null ? 0 : their_features.ptr & ~1, msg == null ? 0 : msg.ptr & ~1);
+               this.ptrs_to.add(their_features);
                this.ptrs_to.add(msg);
        }