Apply rustfmt to entire workspace
Runs cargo fmt --all; all 573 tests still passing, clippy still clean. No logic changes — formatting only. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
3d524e2d63
commit
1c107fe58a
@@ -48,7 +48,9 @@ async fn run_server(server: TcpServer, mut dst: OnionFile) -> OnionFile {
|
||||
|
||||
match conn.recv().await.unwrap() {
|
||||
// ── IBLT pre-flight (push direction) ─────────────────────────────
|
||||
SyncMessage::IbltRequest { sketch: client_iblt } => {
|
||||
SyncMessage::IbltRequest {
|
||||
sketch: client_iblt,
|
||||
} => {
|
||||
let server_revs: Vec<u64> = dst.list_revisions().iter().map(|s| s.revision).collect();
|
||||
|
||||
// Decode diff: what client has that server lacks
|
||||
@@ -59,26 +61,30 @@ async fn run_server(server: TcpServer, mut dst: OnionFile) -> OnionFile {
|
||||
let seed = client_sketch.seed();
|
||||
let srv_sketch = IbltSketch::from_keys(&server_revs, seed);
|
||||
let server_iblt = IbltManifest {
|
||||
agent_id: "test-server".to_string(),
|
||||
file_blake3: [0u8; 32],
|
||||
agent_id: "test-server".to_string(),
|
||||
file_blake3: [0u8; 32],
|
||||
revision_count: server_revs.len() as u64,
|
||||
head_revision: server_revs.last().copied().unwrap_or(0),
|
||||
head_blake3: [0u8; 32],
|
||||
last_write: 0.0,
|
||||
sketch_cells: srv_sketch.cell_count() as u32,
|
||||
sketch: srv_sketch.to_bytes(),
|
||||
head_revision: server_revs.last().copied().unwrap_or(0),
|
||||
head_blake3: [0u8; 32],
|
||||
last_write: 0.0,
|
||||
sketch_cells: srv_sketch.cell_count() as u32,
|
||||
sketch: srv_sketch.to_bytes(),
|
||||
};
|
||||
conn.send(&SyncMessage::IbltResponse {
|
||||
sketch: server_iblt,
|
||||
missing_from_remote: diff.only_in_b.clone(), // client has, server lacks
|
||||
}).await.unwrap();
|
||||
missing_from_remote: diff.only_in_b.clone(), // client has, server lacks
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut packets = Vec::new();
|
||||
loop {
|
||||
match conn.recv().await.unwrap() {
|
||||
SyncMessage::LayerPacket { packet } => {
|
||||
let rev = packet.revision;
|
||||
conn.send(&SyncMessage::Ack { revision: rev }).await.unwrap();
|
||||
conn.send(&SyncMessage::Ack { revision: rev })
|
||||
.await
|
||||
.unwrap();
|
||||
packets.push(packet);
|
||||
}
|
||||
SyncMessage::SyncComplete { .. } => break,
|
||||
@@ -91,19 +97,30 @@ async fn run_server(server: TcpServer, mut dst: OnionFile) -> OnionFile {
|
||||
}
|
||||
|
||||
// ── Flat manifest (pull direction) ────────────────────────────────
|
||||
SyncMessage::ManifestRequest { revision_count: remote_rev_count, .. } => {
|
||||
SyncMessage::ManifestRequest {
|
||||
revision_count: remote_rev_count,
|
||||
..
|
||||
} => {
|
||||
let local_rev_count = dst.revision_count();
|
||||
let manifest = ClawSyncManifest::from_onion("server", &dst, H5_MAGIC);
|
||||
conn.send(&SyncMessage::ManifestResponse { manifest }).await.unwrap();
|
||||
conn.send(&SyncMessage::ManifestResponse { manifest })
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
if local_rev_count > remote_rev_count {
|
||||
let remote_head = if remote_rev_count == 0 { NO_PARENT } else { remote_rev_count - 1 };
|
||||
let remote_head = if remote_rev_count == 0 {
|
||||
NO_PARENT
|
||||
} else {
|
||||
remote_rev_count - 1
|
||||
};
|
||||
let packets = diff_revisions(&dst, remote_head).unwrap();
|
||||
let total = packets.len() as u64;
|
||||
let mut bytes_sent = 0u64;
|
||||
for packet in packets {
|
||||
bytes_sent += packet.page_data_size() as u64;
|
||||
conn.send(&SyncMessage::LayerPacket { packet }).await.unwrap();
|
||||
conn.send(&SyncMessage::LayerPacket { packet })
|
||||
.await
|
||||
.unwrap();
|
||||
match conn.recv().await.unwrap() {
|
||||
SyncMessage::Ack { .. } => {}
|
||||
other => panic!("expected Ack, got {other:?}"),
|
||||
@@ -112,14 +129,18 @@ async fn run_server(server: TcpServer, mut dst: OnionFile) -> OnionFile {
|
||||
conn.send(&SyncMessage::SyncComplete {
|
||||
revisions_transferred: total,
|
||||
bytes_transferred: bytes_sent,
|
||||
}).await.unwrap();
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
} else {
|
||||
let mut packets = Vec::new();
|
||||
loop {
|
||||
match conn.recv().await.unwrap() {
|
||||
SyncMessage::LayerPacket { packet } => {
|
||||
let rev = packet.revision;
|
||||
conn.send(&SyncMessage::Ack { revision: rev }).await.unwrap();
|
||||
conn.send(&SyncMessage::Ack { revision: rev })
|
||||
.await
|
||||
.unwrap();
|
||||
packets.push(packet);
|
||||
}
|
||||
SyncMessage::SyncComplete { .. } => break,
|
||||
@@ -241,7 +262,10 @@ async fn backend_pull_already_in_sync() {
|
||||
let backend = TcpSyncBackend::new(addr, "agent");
|
||||
let stats = backend.pull(&cli_h5).await.unwrap();
|
||||
|
||||
assert_eq!(stats.revisions_transferred, 0, "nothing to pull when in sync");
|
||||
assert_eq!(
|
||||
stats.revisions_transferred, 0,
|
||||
"nothing to pull when in sync"
|
||||
);
|
||||
let _ = (cli_onion, server_task.await.unwrap());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user