Skip to content

The fastest, cheapest, most efficient open-source agent harness. Run more than 500 agents on a $10 VPS.

test(channels): update dispatch tests for envelope message type

Steven Enamakel094322ecbdd5
diff --git a/crates/openhuman-core/src/channels/runtime/dispatch/inbound_batch_tests.rs b/crates/openhuman-core/src/channels/runtime/dispatch/inbound_batch_tests.rs
index 8c371b8f64..83b7c226f4 100644
--- a/crates/openhuman-core/src/channels/runtime/dispatch/inbound_batch_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/dispatch/inbound_batch_tests.rs
@@ -1,19 +1,22 @@
use super::*;
-use tinychannels_bus::ChannelMessage;
+use tinychannels_bus::{ChannelInboundEnvelope, ChannelRef, ConversationRef, SenderRef};
fn queued(seq: u64, id: &str, timestamp: u64, content: &str) -> QueuedInbound {
QueuedInbound {
seq,
inbound: AdmittedInbound {
- msg: ChannelMessage {
- id: id.to_string(),
- sender: "alice".to_string(),
- reply_target: format!("reply-{id}"),
- content: content.to_string(),
- channel: "telegram".to_string(),
- timestamp,
- thread_ts: Some(format!("thread-{id}")),
- sender_name: None,
+ msg: ChannelInboundEnvelope {
+ message_id: id.to_string(),
+ sender: SenderRef { id: "alice".to_string(), ..Default::default() },
+ conversation: ConversationRef {
+ id: format!("reply-{id}"),
+ thread_id: Some(format!("thread-{id}")),
+ ..Default::default()
+ },
+ text: content.to_string(),
+ channel: ChannelRef { id: "telegram".to_string(), ..Default::default() },
+ timestamp_unix_ms: Some(timestamp),
+ ..Default::default()
},
history_key: "telegram_alice_reply".to_string(),
},
@@ -24,9 +27,9 @@ fn queued(seq: u64, id: &str, timestamp: u64, content: &str) -> QueuedInbound {
fn single_message_passes_through_unchanged() {
let one = queued(1, "m1", 5, " hello ");
let merged = merge_channel_batch(vec![one.clone()]).unwrap();
- assert_eq!(merged.msg.content, " hello ");
- assert_eq!(merged.msg.id, "m1");
- assert_eq!(merged.msg.thread_ts.as_deref(), Some("thread-m1"));
+ assert_eq!(merged.msg.text, " hello ");
+ assert_eq!(merged.msg.message_id, "m1");
+ assert_eq!(merged.msg.conversation.thread_id.as_deref(), Some("thread-m1"));
assert_eq!(merged.history_key, one.inbound.history_key);
assert!(merge_channel_batch(Vec::new()).is_none());
}
@@ -39,11 +42,11 @@ fn merge_orders_by_timestamp_then_receive_order_and_uses_newest_as_base() {
queued(1, "m1", 10, "first"),
];
let merged = merge_channel_batch(batch).unwrap();
- assert_eq!(merged.msg.content, "first\nsecond\nthird");
- assert_eq!(merged.msg.id, "m3");
- assert_eq!(merged.msg.reply_target, "reply-m3");
- assert_eq!(merged.msg.thread_ts.as_deref(), Some("thread-m3"));
- assert_eq!(merged.msg.timestamp, 20);
+ assert_eq!(merged.msg.text, "first\nsecond\nthird");
+ assert_eq!(merged.msg.message_id, "m3");
+ assert_eq!(merged.msg.conversation.id, "reply-m3");
+ assert_eq!(merged.msg.conversation.thread_id.as_deref(), Some("thread-m3"));
+ assert_eq!(merged.msg.timestamp_unix_ms, Some(20));
}
#[test]
@@ -55,7 +58,7 @@ fn image_caption_then_text_keeps_marker_in_place_and_skips_blanks() {
];
let merged = merge_channel_batch(batch).unwrap();
assert_eq!(
- merged.msg.content,
+ merged.msg.text,
"[IMAGE:/tmp/a.png]\nlook at this\nwhat is it?"
);
}
@@ -63,12 +66,12 @@ fn image_caption_then_text_keeps_marker_in_place_and_skips_blanks() {
#[test]
fn sender_name_is_the_last_one_present() {
let mut a = queued(1, "m1", 1, "a");
- a.inbound.msg.sender_name = Some("Alice A".into());
+ a.inbound.msg.sender.name = Some("Alice A".into());
let mut b = queued(2, "m2", 2, "b");
- b.inbound.msg.sender_name = Some("Alice B".into());
+ b.inbound.msg.sender.name = Some("Alice B".into());
let c = queued(3, "m3", 3, "c");
let merged = merge_channel_batch(vec![a, b, c]).unwrap();
- assert_eq!(merged.msg.sender_name.as_deref(), Some("Alice B"));
+ assert_eq!(merged.msg.sender.name.as_deref(), Some("Alice B"));
}
#[test]
diff --git a/crates/openhuman-core/src/channels/runtime/dispatch_tests.rs b/crates/openhuman-core/src/channels/runtime/dispatch_tests.rs
index 7753814c83..16e2e804f7 100644
--- a/crates/openhuman-core/src/channels/runtime/dispatch_tests.rs
+++ b/crates/openhuman-core/src/channels/runtime/dispatch_tests.rs
@@ -78,16 +78,14 @@ fn ack_reaction_is_deterministic_and_total_on_edge_inputs() {
// ── build_channel_context_block (#928) ───────────────────────
-fn cm(channel: &str, reply_target: &str) -> traits::ChannelMessage {
- traits::ChannelMessage {
- channel: channel.into(),
- sender: "alice".into(),
- content: "hi".into(),
- id: "m1".into(),
- reply_target: reply_target.into(),
- thread_ts: None,
- timestamp: 0,
- sender_name: None,
+fn cm(channel: &str, reply_target: &str) -> tinychannels_bus::ChannelInboundEnvelope {
+ tinychannels_bus::ChannelInboundEnvelope {
+ channel: tinychannels_bus::ChannelRef { id: channel.into(), ..Default::default() },
+ conversation: tinychannels_bus::ConversationRef { id: reply_target.into(), ..Default::default() },
+ sender: tinychannels_bus::SenderRef { id: "alice".into(), ..Default::default() },
+ text: "hi".into(),
+ message_id: "m1".into(),
+ ..Default::default()
}
}