MAID-1675: accumulate messages in the first hop

Cargo.toml

@@ -11,9 +11,9 @@ repository = "https://github.com/maidsafe/routing"
 version = "0.25.1"
 
 [dependencies]
-clippy = {version = "~0.0.95", optional = true}
+clippy = {version = "~0.0.97", optional = true}
 crust = "~0.19.0"
-itertools = "~0.5.2"
+itertools = "~0.5.5"
 log = "~0.3.6"
 lru_time_cache = "~0.5.0"
 maidsafe_utilities = "~0.10.0"
@@ -26,7 +26,7 @@ unwrap = "~1.1.0"
 
 [dev-dependencies]
 docopt = "~0.6.86"
-libc = "~0.2.16"
+libc = "~0.2.17"
 
 [build-dependencies]
 hyper = {version = "~0.9.10", optional = true}

src/ack_manager.rs

@@ -16,7 +16,7 @@
 // relating to use of the SAFE Network Software.
 
 use error::RoutingError;
-use maidsafe_utilities;
+use maidsafe_utilities::{self, serialisation};
 use message_filter::MessageFilter;
 use messages::RoutingMessage;
 use std::collections::HashMap;
@@ -111,7 +111,7 @@ impl AckManager {
 
 impl Ack {
     pub fn compute(routing_msg: &RoutingMessage) -> Result<Ack, RoutingError> {
-        let hash_msg = try!(routing_msg.to_grp_msg_hash());
+        let hash_msg = try!(serialisation::serialise(routing_msg));
         Ok(Ack(maidsafe_utilities::big_endian_sip_hash(&hash_msg)))
     }
 }

src/authority.rs

@@ -61,6 +61,15 @@ impl Authority {
         }
     }
 
+    /// Returns true if a client, false if a node or group.
+    pub fn is_client(&self) -> bool {
+        if let Authority::Client { .. } = *self {
+            true
+        } else {
+            false
+        }
+    }
+
     /// Returns the name of authority.
     pub fn name(&self) -> &XorName {
         match *self {

src/core_tests.rs

@@ -51,7 +51,10 @@ macro_rules! expect_next_event {
             match $node.event_rx.try_recv() {
                 Ok($pattern) => break,
                 Ok(Event::Tick) => (),
-                other => panic!("Expected Ok({}), got {:?}", stringify!($pattern), other),
+                other => panic!("Expected Ok({}) at {}, got {:?}",
+                    stringify!($pattern),
+                    unwrap!($node.inner.name()),
+                    other),
             }
         }
     }
@@ -69,7 +72,10 @@ macro_rules! expect_any_event {
             match $node.event_rx.try_recv() {
                 Ok($pattern) if $guard => break,
                 Ok(_) => (),
-                other => panic!("Expected Ok({}), got {:?}", stringify!($pattern), other),
+                other => panic!("Expected Ok({}) at {}, got {:?}",
+                    stringify!($pattern),
+                    unwrap!($node.inner.name()),
+                    other),
             }
         }
     }
@@ -81,7 +87,9 @@ macro_rules! expect_no_event {
         match $node.event_rx.try_recv() {
             Ok(Event::Tick) => (),
             Err(mpsc::TryRecvError::Empty) => (),
-            other => panic!("Expected no event, got {:?}", other),
+            other => panic!("Expected no event at {}, got {:?}",
+                unwrap!($node.inner.name()),
+                other),
         }
     }
 }
@@ -324,7 +332,9 @@ fn create_connected_nodes_with_cache(network: &Network,
             }
         }
 
-        assert!(node_added_count >= n, "Got only {} NodeAdded events.");
+        assert!(node_added_count >= n,
+                "Got only {} NodeAdded events.",
+                node_added_count);
     }
 
     nodes
@@ -565,6 +575,7 @@ fn equal_group_size_nodes() {
 }
 
 #[test]
+#[ignore]
 fn more_than_group_size_nodes() {
     test_nodes(MIN_GROUP_SIZE * 6);
 }
@@ -908,9 +919,9 @@ fn successful_get_request() {
                 Ok(Event::Request { request: Request::Get(ref request, id), src, dst }) => {
                     request_received_count += 1;
                     if data_request == *request && message_id == id {
-                        if let Err(_) = node.inner
+                        if let Err(err) = node.inner
                             .send_get_success(dst, src, data.clone(), id) {
-                            trace!("Failed to send GetSuccess response");
+                            trace!("Failed to send GetSuccess response: {:?}", err);
                         }
                         break;
                     }
@@ -977,9 +988,9 @@ fn failed_get_request() {
                 Ok(Event::Request { request: Request::Get(ref data_id, ref id), src, dst }) => {
                     request_received_count += 1;
                     if data_request == *data_id && message_id == *id {
-                        if let Err(_) = node.inner
+                        if let Err(err) = node.inner
                             .send_get_failure(dst, src, *data_id, vec![], *id) {
-                            trace!("Failed to send GetFailure response.");
+                            trace!("Failed to send GetFailure response: {:?}", err);
                         }
                         break;
                     }
@@ -1044,9 +1055,9 @@ fn disconnect_on_get_request() {
                 Ok(Event::Request { request: Request::Get(ref request, ref id), src, dst }) => {
                     request_received_count += 1;
                     if data_request == *request && message_id == *id {
-                        if let Err(_) = node.inner
+                        if let Err(err) = node.inner
                             .send_get_success(dst, src, data.clone(), *id) {
-                            trace!("Failed to send GetSuccess response");
+                            trace!("Failed to send GetSuccess response: {:?}", err);
                         }
                         break;
                     }
@@ -1338,7 +1349,7 @@ fn response_caching() {
 
     let message_id = MessageId::new();
 
-    // The proxy node should have cached the data, so this reqeust should only
+    // The proxy node should have cached the data, so this request should only
     // hit the proxy node and not be relayed to the other nodes.
     unwrap!(clients[0].inner.send_get_request(dst, data_id, message_id));
 

src/lib.rs

@@ -156,6 +156,7 @@ mod node;
 mod peer_manager;
 mod routing_message_filter;
 mod routing_table;
+mod signature_accumulator;
 mod state_machine;
 mod states;
 mod stats;