commit 9d473e576af62208a3e35c54cd05da263196049c
parent 0bd6b0a7fae7b4676b22bb721f5d6452863d0e89
Author: triesap <tyson@radroots.org>
Date: Tue, 14 Jul 2026 21:14:22 +0000
tests: use verified signed event fixtures
- replace unchecked signed-event construction in SDK tests
- recompute fixture wire IDs before verified construction
- assert invalid receipt IDs through verified wire conversion
- keep runtime coverage aligned with the event invariant
Diffstat:
4 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/crates/sdk/tests/dvm_runtime.rs b/crates/sdk/tests/dvm_runtime.rs
@@ -617,10 +617,10 @@ async fn dvm_validation_receipt_ingest_rejects_invalid_receipt_event_id() {
let mut wire = receipt_event.to_nip01_wire();
wire.id = "bad id".to_owned();
let raw_json = serde_json::to_string(&wire).expect("raw event json");
- let error = RadrootsSignedEvent::from_wire_unchecked(wire, raw_json)
+ let error = RadrootsSignedEvent::from_wire_verified_id(wire, raw_json)
.expect_err("invalid receipt event id");
- assert!(error.to_string().contains("event envelope id is invalid"));
+ assert!(error.to_string().contains("event wire id mismatch"));
assert_eq!(
store
.status_summary()
diff --git a/crates/sdk/tests/unit/adapters_radrootsd_tests.rs b/crates/sdk/tests/unit/adapters_radrootsd_tests.rs
@@ -87,8 +87,8 @@ fn spawn_http_server(
}
fn signed_event() -> RadrootsSignedEvent {
- let wire = RadrootsNip01EventWire {
- id: "a".repeat(64),
+ let mut wire = RadrootsNip01EventWire {
+ id: String::new(),
pubkey: "b".repeat(64),
created_at: 1_700_000_000,
kind: 30_402,
@@ -97,17 +97,9 @@ fn signed_event() -> RadrootsSignedEvent {
sig: "c".repeat(128),
extra: Default::default(),
};
- let raw_json = serde_json::json!({
- "id": "a".repeat(64),
- "pubkey": "b".repeat(64),
- "created_at": 1_700_000_000u32,
- "kind": 30402u32,
- "tags": [["d", "listing-1"]],
- "content": "{\"name\":\"carrots\"}",
- "sig": "c".repeat(128)
- })
- .to_string();
- RadrootsSignedEvent::from_wire_unchecked(wire, raw_json).expect("signed event")
+ wire.id = wire.computed_event_id().expect("event id").into_string();
+ let raw_json = serde_json::to_string(&wire).expect("raw event json");
+ RadrootsSignedEvent::from_wire_verified_id(wire, raw_json).expect("signed event")
}
fn publish_request() -> TransportPublishEventRequest {
diff --git a/crates/sdk/tests/unit/dvm_runtime_tests.rs b/crates/sdk/tests/unit/dvm_runtime_tests.rs
@@ -374,8 +374,8 @@ fn hash32(ch: char) -> String {
}
fn dummy_event() -> RadrootsSignedEvent {
- let wire = RadrootsNip01EventWire {
- id: event_id('9').into_string(),
+ let mut wire = RadrootsNip01EventWire {
+ id: String::new(),
pubkey: event_id('a').into_string(),
created_at: 1,
kind: 3440,
@@ -384,15 +384,7 @@ fn dummy_event() -> RadrootsSignedEvent {
sig: "b".repeat(128),
extra: Default::default(),
};
- let raw_json = serde_json::json!({
- "id": wire.id.clone(),
- "pubkey": wire.pubkey.clone(),
- "created_at": wire.created_at,
- "kind": wire.kind,
- "tags": wire.tags.clone(),
- "content": wire.content.clone(),
- "sig": wire.sig.clone()
- })
- .to_string();
- RadrootsSignedEvent::from_wire_unchecked(wire, raw_json).expect("signed event")
+ wire.id = wire.computed_event_id().expect("event id").into_string();
+ let raw_json = serde_json::to_string(&wire).expect("raw event json");
+ RadrootsSignedEvent::from_wire_verified_id(wire, raw_json).expect("signed event")
}
diff --git a/crates/sdk/tests/unit/orders_runtime_tests.rs b/crates/sdk/tests/unit/orders_runtime_tests.rs
@@ -654,9 +654,10 @@ fn event_with_content(event: &RadrootsEventEnvelope, content: String) -> Radroot
}
fn signed_event_from(event: RadrootsEventEnvelope) -> RadrootsSignedEvent {
- let wire = event.to_nip01_wire();
+ let mut wire = event.to_nip01_wire();
+ wire.id = wire.computed_event_id().expect("event id").into_string();
let raw_json = serde_json::to_string(&wire).expect("raw event json");
- RadrootsSignedEvent::from_wire_unchecked(wire, raw_json).expect("signed event")
+ RadrootsSignedEvent::from_wire_verified_id(wire, raw_json).expect("signed event")
}
fn request_signed_event() -> RadrootsSignedEvent {