refactor(dht): move unpack macro to binary_io

Author: kurnevsky

src/toxcore/binary_io.rs

@@ -135,3 +135,20 @@ macro_rules! encode_decode_test (
         }
     )
 );
+
+/// Extract inner content of enums.
+#[cfg(test)]
+macro_rules! unpack {
+    ($variable:expr, $variant:path, $name:ident) => (
+        match $variable {
+            $variant { $name, .. } => $name,
+            other => panic!("Expected {} but got {:?}", stringify!($variant), other),
+        }
+    );
+    ($variable:expr, $variant:path) => (
+        match $variable {
+            $variant(inner) => inner,
+            other => panic!("Expected {} but got {:?}", stringify!($variant), other),
+        }
+    )
+}

src/toxcore/dht/lan_discovery.rs

@@ -145,15 +145,6 @@ mod tests {
 
     use futures::{Future, Stream};
 
-    macro_rules! unpack {
-        ($variable:expr, $variant:path) => (
-            match $variable {
-                $variant(inner) => inner,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        )
-    }
-
     fn broadcast_addrs_count() -> usize {
         get_if_addrs::get_if_addrs().expect("no network interface").iter().filter_map(|interface|
             match interface.addr {

src/toxcore/dht/server/hole_punching.rs

@@ -260,15 +260,6 @@ mod tests {
     use futures::sync::mpsc;
     use std::thread;
 
-    macro_rules! unpack {
-        ($variable:expr, $variant:path) => (
-            match $variable {
-                $variant(inner) => inner,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        )
-    }
-
     #[test]
     fn hole_punch_new_test() {
         let hole_punch = HolePunching::new();

src/toxcore/dht/server/mod.rs

@@ -1133,15 +1133,6 @@ mod tests {
     const ONION_RETURN_2_PAYLOAD_SIZE: usize = ONION_RETURN_2_SIZE - secretbox::NONCEBYTES;
     const ONION_RETURN_3_PAYLOAD_SIZE: usize = ONION_RETURN_3_SIZE - secretbox::NONCEBYTES;
 
-    macro_rules! unpack {
-        ($variable:expr, $variant:path) => (
-            match $variable {
-                $variant(inner) => inner,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        )
-    }
-
     fn create_node() -> (Server, PrecomputedKey, PublicKey, SecretKey,
             mpsc::UnboundedReceiver<(DhtPacket, SocketAddr)>, SocketAddr) {
         crypto_init();

src/toxcore/dht/server/ping_sender.rs

@@ -129,15 +129,6 @@ mod tests {
 
     const BOOTSTRAP_TIMES: u32 = 5;
 
-    macro_rules! unpack {
-        ($variable:expr, $variant:path) => (
-            match $variable {
-                $variant(inner) => inner,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        )
-    }
-
     #[test]
     fn ping_new_test() {
         let _ = PingSender::new();

src/toxcore/net_crypto/mod.rs

@@ -660,21 +660,6 @@ mod tests {
 
     use toxcore::time::ConstNow;
 
-    macro_rules! unpack {
-        ($variable:expr, $variant:path, $name:ident) => (
-            match $variable {
-                $variant { $name, .. } => $name,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        );
-        ($variable:expr, $variant:path) => (
-            match $variable {
-                $variant(inner) => inner,
-                other => panic!("Expected {} but got {:?}", stringify!($variant), other),
-            }
-        )
-    }
-
     #[test]
     fn net_crypto_clone() {
         let (udp_tx, _udp_rx) = mpsc::unbounded();