Michel de Graaf
f1b667f7f9
Seven region audits, every finding adversarially verified against the whole workspace before being applied; 80 landed and the two that failed in application were refuted honestly (ParseError has a from_str_radix producer the audit missed; NatPmpError's Display is the only reader of its diagnostic payloads). The bigger cuts: - The NewPeer/PierceFireWall cluster: an operation variant nothing ever sent, its 77-line arm, a protocol-wrong Client::pierce_firewall that wrote a peer-init frame down the server socket, and the struct only they used. The live paths in peer/listen.rs are untouched. - The ops loop reads `for operation in reader` instead of hand-rolling recv/break, de-indenting the whole dispatch body. - Dead lib surface: Message::print_hex and four unused accessors, UploadFailed, registry and actor getters, build_watch_user, strip_ansi_codes, delegating shims on ClientContext. Removing public items makes this a semver major, which the release pipeline enforces. - Never-used flexibility: the state-migration framework that never held a migration, border-type helpers that all answered Rounded, the TUI's max_concurrent_downloads field nothing read. - Convergence: six poll loops into poll_until, three wrap-around navigation blocks into cycle, hit tests into Rect::contains, char walkers into floor/ceil_char_boundary, five Download literals into one helper, the suites' shared scaffolding into tests/common. Deliberately not taken: swapping the hand-rolled zlib inflate and MD5 for crates (they replace wire-facing machinery whose tolerance of real-world peer quirks no local test exercises) and pulling chrono into the lib for a log timestamp. Recorded for their own decision. Net -1002 lines. Both e2e modes stay green: 94 CLI tests each way, 16 protocol, 33 lib, unit suites, clippy pedantic clean, aislop 100/100 with the four scanner false positives suppressed inline where they fire.
46 lines
1.3 KiB
Rust
46 lines
1.3 KiB
Rust
use crate::{
|
|
message::{Message, MessageHandler},
|
|
peer::PeerMessage,
|
|
};
|
|
use std::sync::mpsc::Sender;
|
|
|
|
/// `PlaceInQueueRequest` (peer code 51): a peer asking where the file they
|
|
/// queued sits in our upload queue.
|
|
///
|
|
/// Worth answering rather than dropping: a downloader that gets no position
|
|
/// cannot tell a long queue from a client that has forgotten about it.
|
|
pub struct PlaceInQueueRequest;
|
|
|
|
impl MessageHandler<PeerMessage> for PlaceInQueueRequest {
|
|
fn get_code(&self) -> u8 {
|
|
51
|
|
}
|
|
|
|
fn handle(&self, message: &mut Message, sender: Sender<PeerMessage>) {
|
|
let filename = message.read_string();
|
|
let _ = sender.send(PeerMessage::IncomingPlaceInQueueRequest(filename));
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::message::framed;
|
|
|
|
#[test]
|
|
fn the_asked_about_filename_is_forwarded() {
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
let mut message = framed(|m| {
|
|
m.write_string("@@share\\track.mp3");
|
|
});
|
|
|
|
PlaceInQueueRequest.handle(&mut message, tx);
|
|
match rx.try_recv() {
|
|
Ok(PeerMessage::IncomingPlaceInQueueRequest(filename)) => {
|
|
assert_eq!(filename, "@@share\\track.mp3");
|
|
}
|
|
other => panic!("unexpected: {other:?}"),
|
|
}
|
|
}
|
|
}
|