poanetwork
/
hbbft
mirror of https://github.com/poanetwork/hbbft.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow the observer on a TestNetwork to send messages

This commit is contained in:
Vladimir Komendantskiy 2018-10-26 17:48:41 +01:00 committed by Andreas Fackler
parent f27af31ac7
commit 45ce045922
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/network/mod.rs
View File

@ -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()`,