add deep_copy method to array_struct

Author: joemphilips

bindings/src/adaptors/primitives.rs

@@ -28,6 +28,12 @@ macro_rules! array_struct{
         unsafe_impl!("Simulate `Unique<T>`" => impl<'a> Sync for $name<'a> where $ty: Sync{});
         impl<'a> $name<'a> {
             fn new(ptr: *const $ty, len: usize) -> Self { $name{ ptr: ptr, len: len, _marker: std::marker::PhantomData } }
+            pub fn deep_copy(&self) -> Self {
+                let r = self.as_ref();
+                let mut result = Vec::with_capacity(self.len);
+                result.copy_from_slice(r);
+                From::from(result.into_boxed_slice())
+            }
         }
         impl<'a> From<&'a [$ty]> for $name<'a> {
             fn from(slice: &'a [$ty]) -> Self {
@@ -76,6 +82,7 @@ impl<'a> TryFrom<SecretKey<'a>> for secp256k1::SecretKey {
 
 #[doc="The length must be [the same as a byte number of secp256k1 public key] `secp256k1::constants::PUBLIC_KEY_SIZE`"]
 array_struct!(PublicKey, u8);
+
 impl<'a> TryFrom<PublicKey<'a>> for secp256k1::PublicKey {
     type Error = FFIResult;
 

bindings/src/peermanager.rs

@@ -20,23 +20,6 @@ lazy_static! {
     static ref SOCKET_DESC_INDEX: AtomicUsize = AtomicUsize::new(0);
 }
 
-fn new_outbound_connection(
-    send_data_ptr: Ref<socket_descriptor_fn::SendData>,
-    disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
-    theirNodeId: Ref<PublicKey>,
-    handle: FFIArcPeerManagerHandle
-) -> FFIResult {
-    let send_data_ref = unsafe_block!("" =>  send_data_ptr.as_ref());
-    let disconnect_socket_ref = unsafe_block!("" =>  disconnect_socket_ptr.as_ref());
-    let index = SOCKET_DESC_INDEX.fetch_add(1, Ordering::SeqCst);
-    let socket = FFISocketDescriptor { index, send_data_ptr: *send_data_ref, disconnect_socket_ptr: *disconnect_socket_ref };
-    let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
-    let theirNodeId: &PublicKey = unsafe_block!("" => theirNodeId.as_ref());
-    let theirNodeId: secp256k1::PublicKey = theirNodeId.clone().try_into()?;
-    peer_man.new_outbound_connection(theirNodeId.clone(),socket)?;
-    FFIResult::ok()
-}
-
 ffi! {
     fn create_peer_manager(
         seed_ptr: Ref<u8>,
@@ -130,6 +113,23 @@ ffi! {
         FFIResult::ok()
     }
 
+    fn new_outbound_connection(
+        send_data_ptr: Ref<socket_descriptor_fn::SendData>,
+        disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
+        their_node_id: Ref<PublicKey>,
+        handle: FFIArcPeerManagerHandle
+    ) -> FFIResult {
+        let send_data_ref = unsafe_block!("" =>  send_data_ptr.as_ref());
+        let disconnect_socket_ref = unsafe_block!("" =>  disconnect_socket_ptr.as_ref());
+        let index = SOCKET_DESC_INDEX.fetch_add(1, Ordering::SeqCst);
+        let socket = FFISocketDescriptor { index, send_data_ptr: *send_data_ref, disconnect_socket_ptr: *disconnect_socket_ref };
+        let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
+        let their_node_id: &PublicKey = unsafe_block!("" => their_node_id.as_ref());
+        let their_node_id: secp256k1::PublicKey = their_node_id.deep_copy().try_into()?;
+        peer_man.new_outbound_connection(their_node_id, socket)?;
+        FFIResult::ok()
+    }
+
     fn timer_tick_occured(handle: FFIArcPeerManagerHandle) -> FFIResult {
         let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());
         peer_man.timer_tick_occured();