Keep buffered Stratum partial line deadline across drains
next-build / build (push) Successful in 13s

This commit is contained in:
2026-10-16 04:01:56 -06:00
parent f302bbbb24
commit 7fd9c8eee3
2 changed files with 34 additions and 2 deletions
+10 -2
View File
@@ -120,7 +120,11 @@ impl StratumWire {
return Err(WireError::LineTooLong);
}
let line = self.buffered.drain(..=end).collect();
self.partial_started = (!self.buffered.is_empty()).then(Instant::now);
self.partial_started = if self.buffered.is_empty() {
None
} else {
self.partial_started.or_else(|| Some(Instant::now()))
};
return Ok(line);
}
if self.buffered.len() >= MAX_POOL_LINE_BYTES {
@@ -221,7 +225,11 @@ impl StratumWire {
return Err(WireError::LineTooLong);
}
let line = self.buffered.drain(..=end).collect();
self.partial_started = (!self.buffered.is_empty()).then(Instant::now);
self.partial_started = if self.buffered.is_empty() {
None
} else {
self.partial_started.or_else(|| Some(Instant::now()))
};
return Ok(Some(line));
}
if self.buffered.len() >= MAX_POOL_LINE_BYTES {
+24
View File
@@ -90,6 +90,30 @@ fn trickled_pool_line_hits_the_absolute_deadline() {
server.join().unwrap();
}
#[test]
fn buffered_complete_lines_do_not_extend_a_partial_line_deadline() {
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
let address = listener.local_addr().unwrap();
let server = thread::spawn(move || {
let (mut stream, _) = listener.accept().unwrap();
stream.write_all(b"first\nsecond\nunfinished").unwrap();
thread::sleep(Duration::from_secs(3));
});
let mut wire = StratumWire::connect(address, Duration::from_secs(2)).unwrap();
let first = loop {
if let Some(line) = wire.try_read_line().unwrap() {
break line;
}
};
assert_eq!(first, b"first\n");
thread::sleep(Duration::from_millis(1300));
assert_eq!(wire.try_read_line().unwrap(), Some(b"second\n".to_vec()));
thread::sleep(Duration::from_millis(800));
assert!(matches!(wire.try_read_line(), Err(WireError::Timeout)));
assert!(wire.is_closed());
server.join().unwrap();
}
#[test]
fn idle_timeout_keeps_connection_available_for_later_messages() {
let listener = TcpListener::bind("127.0.0.1:0").unwrap();