commit c5d6ee72094ccb1f368389569d6e179dd9a3a4e1 parent 575fc38393473a20587457b59689e57824cec057 Author: triesap <tyson@radroots.org> Date: Fri, 31 Jul 2026 12:32:13 +0000 sdk: consume explicit Nostr adapter modules - replace removed Nostr prelude imports in SDK runtime code - update signer adapters and examples to explicit event and type owners - migrate test signers to the explicit frozen-draft signing module - preserve the verified SDK behavior and lockfile graph Diffstat:
8 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/crates/sdk/examples/sdk_v1_myc_nip46_signer_setup.rs b/crates/sdk/examples/sdk_v1_myc_nip46_signer_setup.rs @@ -1,5 +1,6 @@ use radroots_event::envelope::kind::KIND_TRADE_PROPOSAL; -use radroots_nostr::prelude::{RadrootsNostrEvent, RadrootsNostrKeys}; +use radroots_nostr::event::Event as RadrootsNostrEvent; +use radroots_nostr::types::RadrootsNostrKeys; use radroots_nostr_connect::prelude::{ RadrootsNostrConnectClientTarget, RadrootsNostrConnectError, }; diff --git a/crates/sdk/src/adapters/nostr.rs b/crates/sdk/src/adapters/nostr.rs @@ -1,6 +1,7 @@ use core::time::Duration; -use radroots_nostr::prelude::{RadrootsNostrEvent, RadrootsNostrEventId, RadrootsNostrKeys}; +use radroots_nostr::event::{Event as RadrootsNostrEvent, EventId as RadrootsNostrEventId}; +use radroots_nostr::types::RadrootsNostrKeys; use radroots_transport_nostr::{ RadrootsNostrClient, RadrootsNostrClientOptions, RadrootsNostrOutput, RadrootsRelayTransportError, diff --git a/crates/sdk/src/signer_provider.rs b/crates/sdk/src/signer_provider.rs @@ -7,7 +7,8 @@ use radroots_event::envelope::kind::{ }; use radroots_event::wire::Nip01EventWire; use radroots_identity::PublicKey; -use radroots_nostr::prelude::{RadrootsNostrEvent, RadrootsNostrKeys}; +use radroots_nostr::event::Event as RadrootsNostrEvent; +use radroots_nostr::types::RadrootsNostrKeys; use radroots_nostr_connect::prelude::{ RadrootsNostrConnectClientRequest, RadrootsNostrConnectClientTarget, RadrootsNostrConnectClientTransport, RadrootsNostrConnectClientTransportFuture, diff --git a/crates/sdk/tests/support/fixture_signer.rs b/crates/sdk/tests/support/fixture_signer.rs @@ -1,4 +1,5 @@ -use radroots_nostr::prelude::{RadrootsNostrKeys, radroots_nostr_sign_frozen_draft}; +use radroots_nostr::draft_signing::radroots_nostr_sign_frozen_draft; +use radroots_nostr::types::RadrootsNostrKeys; use radroots_signing::{ Error, SignReceipt, SignRequest, Signer, SignerStatus, error::Kind, signer::BoxFuture, }; diff --git a/crates/sdk/tests/unit/runtime_tests.rs b/crates/sdk/tests/unit/runtime_tests.rs @@ -1975,7 +1975,7 @@ async fn restore_archive_private_failures_cover_staging_and_verification_edges() .build() .await .expect("populated sdk"); - let populated_event_keys = radroots_nostr::prelude::RadrootsNostrKeys::generate(); + let populated_event_keys = radroots_nostr::types::RadrootsNostrKeys::generate(); let populated_event_draft = radroots_event::draft::EventDraft::new( "radroots.farm.profile.v1", radroots_event::envelope::kind::KIND_FARM, @@ -1985,7 +1985,7 @@ async fn restore_archive_private_failures_cover_staging_and_verification_edges() populated_event_keys.public_key().to_hex(), ) .expect("event draft"); - let populated_event = radroots_nostr::prelude::radroots_nostr_sign_frozen_draft( + let populated_event = radroots_nostr::draft_signing::radroots_nostr_sign_frozen_draft( &populated_event_keys, &populated_event_draft, ) diff --git a/crates/sdk/tests/unit/signer_provider_tests.rs b/crates/sdk/tests/unit/signer_provider_tests.rs @@ -6,7 +6,8 @@ use radroots_event::draft::EventDraft; use radroots_event::envelope::kind::{ KIND_CLASSIFIED_LISTING, KIND_COOP, KIND_FARM, TRADE_MUTATION_EVENT_KINDS, }; -use radroots_nostr::{prelude::RadrootsNostrEvent, signing::LocalSigner}; +use radroots_nostr::draft_signing::radroots_nostr_sign_frozen_draft; +use radroots_nostr::{event::Event as RadrootsNostrEvent, signing::LocalSigner}; use radroots_nostr_connect::prelude::{ RADROOTS_NOSTR_CONNECT_RPC_KIND, RadrootsNostrConnectClientTarget, RadrootsNostrConnectError, RadrootsNostrConnectRequest, RadrootsNostrConnectRequestMessage, RadrootsNostrConnectResponse, @@ -113,8 +114,7 @@ fn frozen_draft_with( } fn sign_event(keys: &RadrootsNostrKeys, draft: &EventDraft) -> RadrootsNostrEvent { - let signed = - radroots_nostr::prelude::radroots_nostr_sign_frozen_draft(keys, draft).expect("signed"); + let signed = radroots_nostr_sign_frozen_draft(keys, draft).expect("signed"); RadrootsNostrEvent::from_json(signed.raw_json()).expect("event") } @@ -557,8 +557,7 @@ async fn myc_nip46_provider_signs_and_validates_remote_event() { let remote_keys = remote_keys(); let user_keys = user_keys(); let draft = frozen_draft(); - let signed = radroots_nostr::prelude::radroots_nostr_sign_frozen_draft(&user_keys, &draft) - .expect("signed"); + let signed = radroots_nostr_sign_frozen_draft(&user_keys, &draft).expect("signed"); let signed_event = RadrootsNostrEvent::from_json(signed.raw_json()).expect("event"); let transport = Arc::new(MockNip46Transport::new( remote_keys.clone(), @@ -719,8 +718,7 @@ async fn myc_nip46_provider_reports_preflight_and_progress_sink_edges() { async fn myc_nip46_provider_returns_completion_progress_errors_after_remote_sign() { let user_keys = user_keys(); let draft = frozen_draft(); - let signed = radroots_nostr::prelude::radroots_nostr_sign_frozen_draft(&user_keys, &draft) - .expect("signed"); + let signed = radroots_nostr_sign_frozen_draft(&user_keys, &draft).expect("signed"); let signed_event = RadrootsNostrEvent::from_json(signed.raw_json()).expect("event"); let (signer, transport) = myc_signer_with_responses(vec![MockNip46Response::Respond( RadrootsNostrConnectResponse::SignedEvent(signed_event), diff --git a/crates/sdk/tests/unit/sync_runtime_tests.rs b/crates/sdk/tests/unit/sync_runtime_tests.rs @@ -26,7 +26,8 @@ use radroots_event::envelope::kind::KIND_FARM; use radroots_event::id::EventId; use radroots_event_store::RadrootsEventStoreStatusSummary; #[cfg(feature = "radrootsd-execution")] -use radroots_nostr::prelude::{RadrootsNostrKeys, radroots_nostr_sign_frozen_draft}; +use radroots_nostr::draft_signing::radroots_nostr_sign_frozen_draft; +use radroots_nostr::types::RadrootsNostrKeys; #[cfg(feature = "radrootsd-execution")] use radroots_outbox::{ RadrootsOutboxClaimedEvent, RadrootsOutboxDeliveryPlanInput, RadrootsOutboxDeliveryPlanStatus, diff --git a/crates/sdk/tests/unit/workflow_runtime_tests.rs b/crates/sdk/tests/unit/workflow_runtime_tests.rs @@ -4,7 +4,8 @@ use crate::{RadrootsSdkLocalKeySigner, RadrootsSdkSignerProvider}; use radroots_event::contract::AuthorRole; use radroots_event::draft::{EventDraft, SignedEvent, SignedEventParts}; use radroots_event::envelope::kind::{KIND_FARM, KIND_GEOCHAT}; -use radroots_nostr::prelude::{RadrootsNostrKeys, radroots_nostr_sign_frozen_draft}; +use radroots_nostr::draft_signing::radroots_nostr_sign_frozen_draft; +use radroots_nostr::types::RadrootsNostrKeys; use radroots_signing::{ Error as SigningError, SignReceipt, SignRequest, SignerStatus, actor::ActorSource, error::Kind as SigningErrorKind, signer::BoxFuture,