huskies: merge 946

server/src/agent_mode/claim.rs

@@ -105,11 +105,12 @@ mod tests {
         // Confirm the stale claim is in place.
         let before = read_item(story_id).expect("item should exist");
         assert_eq!(
-            before.claimed_by(),
+            before.claim().map(|c| c.node.as_str()),
             Some(stale_holder),
             "pre-condition: item should be claimed by the stale holder"
         );
-        let age = chrono::Utc::now().timestamp() as f64 - before.claimed_at().unwrap_or(0.0);
+        let age = chrono::Utc::now().timestamp() as f64
+            - before.claim().map(|c| c.at as f64).unwrap_or(0.0);
         assert!(
             age >= CLAIM_TIMEOUT_SECS,
             "pre-condition: claim age ({age}s) must exceed TTL ({CLAIM_TIMEOUT_SECS}s)"
@@ -136,12 +137,12 @@ mod tests {
         let our_id = our_node_id().expect("node id should be available after init_for_test");
         let after = read_item(story_id).expect("item should still exist");
         assert_eq!(
-            after.claimed_by(),
+            after.claim().map(|c| c.node.as_str()),
             Some(our_id.as_str()),
             "new claim should have displaced the stale holder"
         );
         assert_ne!(
-            after.claimed_by(),
+            after.claim().map(|c| c.node.as_str()),
             Some(stale_holder),
             "stale holder must no longer own the claim"
         );