Rename TerminalState to TerminalFailure

It's always a failure state.

Author: DanGould

payjoin-cli/src/app/v2/mod.rs

@@ -307,7 +307,7 @@ impl App {
                     self.send_payjoin_proposal(proposal, persister).await,
                 ReceiverTypeState::Uninitialized(_) =>
                     return Err(anyhow!("Uninitialized receiver session")),
-                ReceiverTypeState::TerminalState =>
+                ReceiverTypeState::TerminalFailure =>
                     return Err(anyhow!("Terminal receiver session")),
             }
         };

payjoin-ffi/src/receive/uni.rs

@@ -46,7 +46,7 @@ pub enum ReceiverTypeState {
     WantsInputs { inner: Arc<WantsInputs> },
     ProvisionalProposal { inner: Arc<ProvisionalProposal> },
     PayjoinProposal { inner: Arc<PayjoinProposal> },
-    TerminalState,
+    TerminalFailure,
 }
 
 impl From<super::ReceiverTypeState> for ReceiverTypeState {
@@ -77,7 +77,7 @@ impl From<super::ReceiverTypeState> for ReceiverTypeState {
             PayjoinProposal(inner) => Self::PayjoinProposal {
                 inner: Arc::new(super::PayjoinProposal::from(inner).into()),
             },
-            TerminalState => Self::TerminalState,
+            TerminalFailure => Self::TerminalFailure,
         }
     }
 }

payjoin-ffi/src/send/uni.rs

@@ -39,7 +39,7 @@ pub enum SenderTypeState {
     WithReplyKey { inner: Arc<WithReplyKey> },
     V2GetContext { inner: Arc<V2GetContext> },
     ProposalReceived { inner: Arc<Psbt> },
-    TerminalState,
+    TerminalFailure,
 }
 
 impl From<super::SenderTypeState> for SenderTypeState {
@@ -52,7 +52,7 @@ impl From<super::SenderTypeState> for SenderTypeState {
             V2GetContext(inner) =>
                 Self::V2GetContext { inner: Arc::new(super::V2GetContext::from(inner).into()) },
             ProposalReceived(inner) => Self::ProposalReceived { inner: Arc::new(inner.into()) },
-            TerminalState => Self::TerminalState,
+            TerminalFailure => Self::TerminalFailure,
         }
     }
 }

payjoin/src/receive/v2/mod.rs

@@ -83,7 +83,7 @@ fn subdir_path_from_pubkey(pubkey: &HpkePublicKey) -> ShortId {
 }
 
 /// Represents the various states of a Payjoin receiver session during the protocol flow.
-/// Each variant wraps a `Receiver` with a specific state type, except for `TerminalState` which
+/// Each variant wraps a `Receiver` with a specific state type, except for `TerminalFailure` which
 /// indicates the session has ended or is invalid.
 #[derive(Debug, Clone, PartialEq)]
 pub enum ReceiverTypeState {
@@ -97,7 +97,7 @@ pub enum ReceiverTypeState {
     WantsInputs(Receiver<WantsInputs>),
     ProvisionalProposal(Receiver<ProvisionalProposal>),
     PayjoinProposal(Receiver<PayjoinProposal>),
-    TerminalState,
+    TerminalFailure,
 }
 
 impl ReceiverTypeState {
@@ -143,7 +143,7 @@ impl ReceiverTypeState {
                 ReceiverTypeState::ProvisionalProposal(state),
                 SessionEvent::PayjoinProposal(payjoin_proposal),
             ) => Ok(state.apply_payjoin_proposal(payjoin_proposal)),
-            (_, SessionEvent::SessionInvalid(_, _)) => Ok(ReceiverTypeState::TerminalState),
+            (_, SessionEvent::SessionInvalid(_, _)) => Ok(ReceiverTypeState::TerminalFailure),
             (current_state, event) => Err(InternalReplayError::InvalidStateAndEvent(
                 Box::new(current_state),
                 Box::new(event),

payjoin/src/send/v2/mod.rs

@@ -167,7 +167,7 @@ pub enum SenderTypeState {
     WithReplyKey(Sender<WithReplyKey>),
     V2GetContext(Sender<V2GetContext>),
     ProposalReceived(Psbt),
-    TerminalState,
+    TerminalFailure,
 }
 
 impl SenderTypeState {
@@ -181,7 +181,7 @@ impl SenderTypeState {
                 Ok(state.apply_v2_get_context(v2_get_context)),
             (SenderTypeState::V2GetContext(_state), SessionEvent::ProposalReceived(proposal)) =>
                 Ok(SenderTypeState::ProposalReceived(proposal)),
-            (_, SessionEvent::SessionInvalid(_)) => Ok(SenderTypeState::TerminalState),
+            (_, SessionEvent::SessionInvalid(_)) => Ok(SenderTypeState::TerminalFailure),
             (current_state, event) => Err(InternalReplayError::InvalidStateAndEvent(
                 Box::new(current_state),
                 Box::new(event),