simplify poh recorder => broadcast channel (#5940)

* simplify poh recorder broadcast channel

* fixup

* fixup
This commit is contained in:
Rob Walker
2019-09-18 12:16:22 -07:00
committed by GitHub
parent 64f23ab26a
commit 0d4a2c5eb0
12 changed files with 168 additions and 203 deletions

View File

@@ -162,34 +162,33 @@ mod tests {
let mut need_partial = true;
while need_tick || need_entry || need_partial {
for entry in entry_receiver.recv().unwrap().1 {
let entry = &entry.0;
if entry.is_tick() {
assert!(
entry.num_hashes <= poh_config.hashes_per_tick.unwrap(),
format!(
"{} <= {}",
entry.num_hashes,
poh_config.hashes_per_tick.unwrap()
)
);
let (_bank, (entry, _tick_height)) = entry_receiver.recv().unwrap();
if entry.num_hashes == poh_config.hashes_per_tick.unwrap() {
need_tick = false;
} else {
need_partial = false;
}
if entry.is_tick() {
assert!(
entry.num_hashes <= poh_config.hashes_per_tick.unwrap(),
format!(
"{} <= {}",
entry.num_hashes,
poh_config.hashes_per_tick.unwrap()
)
);
hashes += entry.num_hashes;
assert_eq!(hashes, poh_config.hashes_per_tick.unwrap());
hashes = 0;
if entry.num_hashes == poh_config.hashes_per_tick.unwrap() {
need_tick = false;
} else {
assert!(entry.num_hashes >= 1);
need_entry = false;
hashes += entry.num_hashes;
need_partial = false;
}
hashes += entry.num_hashes;
assert_eq!(hashes, poh_config.hashes_per_tick.unwrap());
hashes = 0;
} else {
assert!(entry.num_hashes >= 1);
need_entry = false;
hashes += entry.num_hashes;
}
}
exit.store(true, Ordering::Relaxed);