Fix ffi fmt and run fmt --check in CI (payjoin#832)

Author: spacebear21

.github/workflows/rust.yml

@@ -37,6 +37,19 @@ jobs:
       - run: rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu
       - name: "Run formatting check"
         run: cargo fmt --all -- --check
+  
+  Format-FFI:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout repo"
+        uses: actions/checkout@v4
+      - name: "Install nightly toolchain"
+        uses: dtolnay/rust-toolchain@nightly
+      - name: "Use cache"
+        uses: Swatinem/rust-cache@v2
+      - run: rustup component add rustfmt --toolchain nightly-x86_64-unknown-linux-gnu
+      - name: "Run formatting check"
+        run: cd payjoin-ffi && cargo fmt --all -- --check
 
   Lint:
     runs-on: ubuntu-latest

payjoin-ffi/src/lib.rs

@@ -12,7 +12,7 @@ pub mod send;
 pub mod test_utils;
 pub mod uri;
 
-pub use payjoin::persist::{NoopSessionPersister};
+pub use payjoin::persist::NoopSessionPersister;
 
 pub use crate::bitcoin_ffi::*;
 pub use crate::ohttp::*;

payjoin-ffi/src/send/error.rs

@@ -120,7 +120,8 @@ impl From<ImplementationError> for SenderPersistedError {
     fn from(value: ImplementationError) -> Self { SenderPersistedError::Storage(Arc::new(value)) }
 }
 
-impl<S> From<payjoin::persist::PersistedError<send::v2::EncapsulationError, S>> for SenderPersistedError
+impl<S> From<payjoin::persist::PersistedError<send::v2::EncapsulationError, S>>
+    for SenderPersistedError
 where
     S: std::error::Error,
 {

payjoin-ffi/src/send/mod.rs

@@ -33,7 +33,9 @@ impl From<payjoin::send::v2::SendSession> for SendSession {
     fn from(value: payjoin::send::v2::SendSession) -> Self { Self(value) }
 }
 
-pub fn replay_event_log<P>(persister: &P) -> Result<(SendSession, SessionHistory), SenderReplayError>
+pub fn replay_event_log<P>(
+    persister: &P,
+) -> Result<(SendSession, SessionHistory), SenderReplayError>
 where
     P: SessionPersister + Clone,
     P::SessionEvent: Into<payjoin::send::v2::SessionEvent> + Clone,
@@ -69,12 +71,17 @@ impl InitInputsTransition {
     where
         P: SessionPersister<SessionEvent = payjoin::send::v2::SessionEvent>,
     {
-        let mut inner =
-            self.0.write().map_err(|_| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Lock poisoned".to_string()))))?;
-
-        let value = inner
-            .take()
-            .ok_or_else(|| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Already saved or moved".to_string()))))?;
+        let mut inner = self.0.write().map_err(|_| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Lock poisoned".to_string(),
+            )))
+        })?;
+
+        let value = inner.take().ok_or_else(|| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Already saved or moved".to_string(),
+            )))
+        })?;
 
         let res = value.save(persister).map_err(|e| SenderPersistedError::from(e))?;
         Ok(res.into())
@@ -195,12 +202,17 @@ impl WithReplyKeyTransition {
     where
         P: SessionPersister<SessionEvent = payjoin::send::v2::SessionEvent>,
     {
-        let mut inner =
-            self.0.write().map_err(|_| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Lock poisoned".to_string()))))?;
-
-        let value = inner
-            .take()
-            .ok_or_else(|| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Already saved or moved".to_string()))))?;
+        let mut inner = self.0.write().map_err(|_| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Lock poisoned".to_string(),
+            )))
+        })?;
+
+        let value = inner.take().ok_or_else(|| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Already saved or moved".to_string(),
+            )))
+        })?;
 
         let res = value.save(persister).map_err(|e| SenderPersistedError::from(e))?;
         Ok(res.into())
@@ -291,9 +303,7 @@ impl V2GetContextTransitionOutcome {
 
     pub fn is_success(&self) -> bool { self.0.is_success() }
 
-    pub fn success(&self) -> Option<Psbt> {
-        self.0.success().map(|r| r.clone().into())
-    }
+    pub fn success(&self) -> Option<Psbt> { self.0.success().map(|r| r.clone().into()) }
 }
 
 impl
@@ -330,16 +340,24 @@ pub struct V2GetContextTransition(
 );
 
 impl V2GetContextTransition {
-    pub fn save<P>(&self, persister: &P) -> Result<V2GetContextTransitionOutcome, SenderPersistedError>
+    pub fn save<P>(
+        &self,
+        persister: &P,
+    ) -> Result<V2GetContextTransitionOutcome, SenderPersistedError>
     where
         P: SessionPersister<SessionEvent = payjoin::send::v2::SessionEvent>,
     {
-        let mut inner =
-            self.0.write().map_err(|_| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Lock poisoned".to_string()))))?;
-
-        let value = inner
-            .take()
-            .ok_or_else(|| SenderPersistedError::Storage(Arc::new(ImplementationError::from("Already saved or moved".to_string()))))?;
+        let mut inner = self.0.write().map_err(|_| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Lock poisoned".to_string(),
+            )))
+        })?;
+
+        let value = inner.take().ok_or_else(|| {
+            SenderPersistedError::Storage(Arc::new(ImplementationError::from(
+                "Already saved or moved".to_string(),
+            )))
+        })?;
 
         let res = value.save(persister).map_err(|e| SenderPersistedError::from(e))?;
         Ok(res.into())

payjoin-ffi/src/send/uni.rs

@@ -2,12 +2,12 @@ use std::sync::{Arc, RwLock};
 
 use bitcoin_ffi::Psbt;
 
-use crate::{error::ForeignError, Url};
+use crate::error::ForeignError;
 use crate::send::error::{SenderPersistedError, SenderReplayError};
 pub use crate::send::{
     BuildSenderError, CreateRequestError, EncapsulationError, ResponseError, SerdeJsonError,
 };
-use crate::{ClientResponse, PjUri, Request};
+use crate::{ClientResponse, PjUri, Request, Url};
 
 #[derive(uniffi::Object, Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct SenderSessionEvent(super::SessionEvent);
@@ -71,12 +71,12 @@ impl From<SenderSessionHistory> for super::SessionHistory {
 #[uniffi::export]
 impl SenderSessionHistory {
     pub fn endpoint(&self) -> Option<Arc<Url>> {
-        self.0.0.endpoint().map(|url| Arc::new(url.clone().into()))
+        self.0 .0.endpoint().map(|url| Arc::new(url.clone().into()))
     }
 
     /// Fallback transaction from the session if present
     pub fn fallback_tx(&self) -> Option<Arc<crate::Transaction>> {
-        self.0.0.fallback_tx().map(|tx| Arc::new(tx.into()))
+        self.0 .0.fallback_tx().map(|tx| Arc::new(tx.into()))
     }
 }
 
@@ -98,7 +98,8 @@ pub fn replay_sender_event_log(
     persister: Arc<dyn JsonSenderSessionPersister>,
 ) -> Result<SenderReplayResult, SenderReplayError> {
     let adapter = CallbackPersisterAdapter::new(persister);
-    let (state, session_history) = super::replay_event_log(&adapter).map_err(SenderReplayError::from)?;
+    let (state, session_history) =
+        super::replay_event_log(&adapter).map_err(SenderReplayError::from)?;
     Ok(SenderReplayResult { state: state.into(), session_history: session_history.into() })
 }
 
@@ -317,9 +318,7 @@ impl V2GetContextTransitionOutcome {
 
     pub fn is_success(&self) -> bool { self.0.is_success() }
 
-    pub fn success(&self) -> Option<Arc<Psbt>> {
-        self.0.success().map(|p| p.into())
-    }
+    pub fn success(&self) -> Option<Arc<Psbt>> { self.0.success().map(|p| p.into()) }
 }
 
 #[derive(uniffi::Object)]