Fix Dart receiver issue bindings

Rename the nested receiver detail UniFFI objects away from\ntrailing Error names so regenerated Dart bindings stay\nself-consistent.\n\nThe Dart generator maps object declarations ending in Error to\nException classes, but the new optional accessors on\nProtocolError were still emitted with the original Rust type\nnames. That left the generated bindings referring to\nnonexistent PayloadError, RequestError, and SessionError\nclasses after regeneration.\n\nKeep the top-level SessionError exception for direct result paths,\nbut expose the nested protocol detail objects as PayloadIssue,\nRequestIssue, and SessionIssue instead. This preserves the\nreceiver error shape while fixing the CI-only Dart build failure\nthat appears after running the binding generator.

Author: chavic

payjoin-ffi/src/receive/error.rs

@@ -242,9 +242,9 @@ pub struct ProtocolError {
     kind: ProtocolErrorKind,
     message: String,
     reply: receive::JsonReply,
-    payload_error: Option<Arc<PayloadError>>,
-    request_error: Option<Arc<RequestError>>,
-    session_error: Option<Arc<SessionError>>,
+    payload_error: Option<Arc<PayloadIssue>>,
+    request_error: Option<Arc<RequestIssue>>,
+    session_error: Option<Arc<SessionIssue>>,
 }
 
 impl From<receive::ProtocolError> for ProtocolError {
@@ -288,11 +288,11 @@ impl ProtocolError {
 
     pub fn message(&self) -> String { self.message.clone() }
 
-    pub fn payload_error(&self) -> Option<Arc<PayloadError>> { self.payload_error.clone() }
+    pub fn payload_error(&self) -> Option<Arc<PayloadIssue>> { self.payload_error.clone() }
 
-    pub fn request_error(&self) -> Option<Arc<RequestError>> { self.request_error.clone() }
+    pub fn request_error(&self) -> Option<Arc<RequestIssue>> { self.request_error.clone() }
 
-    pub fn session_error(&self) -> Option<Arc<SessionError>> { self.session_error.clone() }
+    pub fn session_error(&self) -> Option<Arc<SessionIssue>> { self.session_error.clone() }
 }
 
 /// The standard format for errors that can be replied as JSON.
@@ -340,16 +340,37 @@ impl SessionError {
     pub fn message(&self) -> String { self.message.clone() }
 }
 
-/// Receiver original payload validation error exposed over FFI.
+/// Receiver protocol session issue exposed over FFI.
 #[derive(Debug, thiserror::Error, uniffi::Object)]
 #[error("{message}")]
-pub struct PayloadError {
+pub struct SessionIssue {
+    kind: SessionErrorKind,
+    message: String,
+}
+
+impl From<receive::v2::SessionError> for SessionIssue {
+    fn from(value: receive::v2::SessionError) -> Self {
+        Self { kind: value.kind().into(), message: value.to_string() }
+    }
+}
+
+#[uniffi::export]
+impl SessionIssue {
+    pub fn kind(&self) -> SessionErrorKind { self.kind }
+
+    pub fn message(&self) -> String { self.message.clone() }
+}
+
+/// Receiver original payload issue exposed over FFI.
+#[derive(Debug, thiserror::Error, uniffi::Object)]
+#[error("{message}")]
+pub struct PayloadIssue {
     kind: PayloadErrorKind,
     message: String,
     supported_versions: Option<Vec<u64>>,
 }
 
-impl From<receive::PayloadError> for PayloadError {
+impl From<receive::PayloadError> for PayloadIssue {
     fn from(value: receive::PayloadError) -> Self {
         Self {
             kind: value.kind().into(),
@@ -360,18 +381,18 @@ impl From<receive::PayloadError> for PayloadError {
 }
 
 #[uniffi::export]
-impl PayloadError {
+impl PayloadIssue {
     pub fn kind(&self) -> PayloadErrorKind { self.kind }
 
     pub fn message(&self) -> String { self.message.clone() }
 
     pub fn supported_versions(&self) -> Option<Vec<u64>> { self.supported_versions.clone() }
 }
 
-/// Receiver v1 request validation error exposed over FFI.
+/// Receiver v1 request issue exposed over FFI.
 #[derive(Debug, thiserror::Error, uniffi::Object)]
 #[error("{message}")]
-pub struct RequestError {
+pub struct RequestIssue {
     kind: RequestErrorKind,
     message: String,
     header_name: Option<String>,
@@ -380,7 +401,7 @@ pub struct RequestError {
     actual_content_length: Option<u64>,
 }
 
-impl From<receive::v1::RequestError> for RequestError {
+impl From<receive::v1::RequestError> for RequestIssue {
     fn from(value: receive::v1::RequestError) -> Self {
         Self {
             kind: value.kind().into(),
@@ -394,7 +415,7 @@ impl From<receive::v1::RequestError> for RequestError {
 }
 
 #[uniffi::export]
-impl RequestError {
+impl RequestIssue {
     pub fn kind(&self) -> RequestErrorKind { self.kind }
 
     pub fn message(&self) -> String { self.message.clone() }

payjoin-ffi/src/receive/mod.rs

@@ -3,9 +3,9 @@ use std::sync::{Arc, RwLock};
 
 pub use error::{
     AddressParseError, InputContributionError, InputPairError, JsonReply, OutputSubstitutionError,
-    PayloadError, PayloadErrorKind, ProtocolError, ProtocolErrorKind, PsbtInputError,
-    ReceiverBuilderError, ReceiverError, RequestError, RequestErrorKind, SelectionError,
-    SessionError, SessionErrorKind,
+    PayloadErrorKind, PayloadIssue, ProtocolError, ProtocolErrorKind, PsbtInputError,
+    ReceiverBuilderError, ReceiverError, RequestErrorKind, RequestIssue, SelectionError,
+    SessionError, SessionErrorKind, SessionIssue,
 };
 use payjoin::bitcoin::consensus::Decodable;
 use payjoin::bitcoin::psbt::Psbt;