From 45ce045922a2b5c19575884ab9de30291502687d Mon Sep 17 00:00:00 2001
From: Vladimir Komendantskiy <komendantsky@gmail.com>
Date: Fri, 26 Oct 2018 17:48:41 +0100
Subject: [PATCH] allow the observer on a TestNetwork to send messages

---
 tests/network/mod.rs | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/tests/network/mod.rs b/tests/network/mod.rs
index 8bde8a8a..3e91bfa5 100644
--- a/tests/network/mod.rs
+++ b/tests/network/mod.rs
@@ -445,6 +445,10 @@ where
         for (id, node) in &mut network.nodes {
             initial_msgs.push((*id, node.messages.drain(..).collect()));
         }
+        initial_msgs.push((
+            network.observer.id,
+            network.observer.messages.drain(..).collect(),
+        ));
         for (id, msgs) in initial_msgs {
             network.dispatch_messages(id, msgs);
         }
@@ -464,9 +468,11 @@ where
                             node.queue.push_back((sender_id, msg.message.clone()))
                         }
                     }
-                    self.observer
-                        .queue
-                        .push_back((sender_id, msg.message.clone()));
+                    if self.observer.id != sender_id {
+                        self.observer
+                            .queue
+                            .push_back((sender_id, msg.message.clone()));
+                    }
                     self.adversary.push_message(sender_id, msg);
                 }
                 Target::Node(to_id) => {
@@ -474,6 +480,8 @@ where
                         self.adversary.push_message(sender_id, msg);
                     } else if let Some(node) = self.nodes.get_mut(&to_id) {
                         node.queue.push_back((sender_id, msg.message));
+                    } else if self.observer.id == to_id {
+                        self.observer.queue.push_back((sender_id, msg.message));
                     } else {
                         warn!(
                             "Unknown recipient {:?} for message: {:?}",
@@ -483,6 +491,12 @@ where
                 }
             }
         }
+        self.observer_handle_messages();
+        self.observer_dispatch_messages();
+    }
+
+    /// Handles all messages queued for the observer.
+    fn observer_handle_messages(&mut self) {
         while !self.observer.queue.is_empty() {
             self.observer.handle_message();
             let faults: Vec<_> = self.observer.faults.drain(..).collect();
@@ -490,6 +504,16 @@ where
         }
     }
 
+    /// Dispatches messages from the observer to the queues of the recipients of those messages.
+    fn observer_dispatch_messages(&mut self) {
+        self.observer_handle_messages();
+        let observer_msgs: Vec<_> = self.observer.messages.drain(..).collect();
+        if !observer_msgs.is_empty() {
+            let observer_id = self.observer.id;
+            self.dispatch_messages(observer_id, observer_msgs);
+        }
+    }
+
     /// Performs one iteration of the network, consisting of the following steps:
     ///
     /// 1. Give the adversary a chance to send messages of his choosing through `Adversary::step()`,