Make Tx status transitions in tests more explicit

Author: Rafał Chabowski

crates/fuel-core/src/query/subscriptions/test.rs

@@ -83,14 +83,20 @@ fn squeezed_during_block_production() -> TransactionStatus {
 /// Final indicates that the transaction has reached one of the final statuses (Success, Squeezed, or Failed).
 #[derive(Debug, Clone, PartialEq, Eq, Arbitrary)]
 enum TxStatus {
-    /// The transaction has been submitted
-    Submitted,
-    /// The transaction has been preconfirmed, but the final status could still be different
-    Preconfirmed,
+    /// The transaction has not reached a final status
+    NotFinal(NotFinalTxStatus),
     /// The transaction has reached a final status
     Final(FinalTxStatus),
 }
 
+/// Struct representing a submitted transaction.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Arbitrary)]
+enum NotFinalTxStatus {
+    Submitted,
+    PreconfirmationSuccess,
+    PreconfirmationFailure,
+}
+
 /// Represents the final transaction statuses (Success, Squeezed, Failed).
 #[derive(Debug, Clone, PartialEq, Eq, Arbitrary)]
 enum FinalTxStatus {
@@ -99,6 +105,8 @@ enum FinalTxStatus {
     /// The transaction was squeezed out of the txpool (or block)
     /// because it was not valid to include in the block.
     Squeezed,
+    /// The transaction was squeezed out during block production.
+    PreconfirmationSqueeze,
     /// The transaction failed to execute and was included in a block.
     Failed,
 }
@@ -143,15 +151,8 @@ fn input_stream() -> impl Strategy<Value = Vec<TxStatusMessage>> {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Arbitrary)]
 struct Error;
 
-/// Struct representing a submitted transaction.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Arbitrary)]
-enum NotFinal {
-    Submitted,
-    Preconfirmation,
-}
-
 /// A model of the transaction status change functions control flow.
-type Flow = ControlFlow<FinalTxStatus, NotFinal>;
+type Flow = ControlFlow<FinalTxStatus, NotFinalTxStatus>;
 
 /// The `transaction_status_change_model` function is a simplified version of the real
 /// `transaction_status_change` function. It takes an `Option` and an `Iterator` as input
@@ -181,8 +182,15 @@ fn transaction_status_change_model(
                 // If the next state is "Continue" with "Submitted" status, push it to the output vector
                 Flow::Continue(not_final_status) => {
                     match not_final_status {
-                        NotFinal::Submitted => out.push(Ok(TxStatus::Submitted)),
-                        NotFinal::Preconfirmation => out.push(Ok(TxStatus::Preconfirmed)),
+                        NotFinalTxStatus::Submitted => {
+                            out.push(Ok(TxStatus::NotFinal(NotFinalTxStatus::Submitted)))
+                        }
+                        NotFinalTxStatus::PreconfirmationSuccess => out.push(Ok(
+                            TxStatus::NotFinal(NotFinalTxStatus::PreconfirmationSuccess),
+                        )),
+                        NotFinalTxStatus::PreconfirmationFailure => out.push(Ok(
+                            TxStatus::NotFinal(NotFinalTxStatus::PreconfirmationFailure),
+                        )),
                     }
                     ControlFlow::Continue(out)
                 }
@@ -210,18 +218,20 @@ fn transaction_status_change_model(
 /// The flow continues only for `Submitted` status, otherwise it breaks with appropriate status.
 fn next_state(state: TransactionStatus) -> Flow {
     match state {
-        TransactionStatus::Submitted { .. } => Flow::Continue(NotFinal::Submitted),
+        TransactionStatus::Submitted { .. } => {
+            Flow::Continue(NotFinalTxStatus::Submitted)
+        }
         TransactionStatus::Success { .. } => Flow::Break(FinalTxStatus::Success),
         TransactionStatus::PreConfirmationSuccess { .. } => {
-            Flow::Continue(NotFinal::Preconfirmation)
+            Flow::Continue(NotFinalTxStatus::PreconfirmationSuccess)
         }
         TransactionStatus::Failure { .. } => Flow::Break(FinalTxStatus::Failed),
         TransactionStatus::PreConfirmationFailure { .. } => {
-            Flow::Continue(NotFinal::Preconfirmation)
+            Flow::Continue(NotFinalTxStatus::PreconfirmationFailure)
         }
-        TransactionStatus::SqueezedOut { .. }
-        | TransactionStatus::PreConfirmationSqueezedOut { .. } => {
-            Flow::Break(FinalTxStatus::Squeezed)
+        TransactionStatus::SqueezedOut { .. } => Flow::Break(FinalTxStatus::Squeezed),
+        TransactionStatus::PreConfirmationSqueezedOut { .. } => {
+            Flow::Break(FinalTxStatus::PreconfirmationSqueeze)
         }
     }
 }
@@ -283,25 +293,25 @@ impl From<crate::schema::tx::types::TransactionStatus> for TxStatus {
     fn from(status: crate::schema::tx::types::TransactionStatus) -> Self {
         match status {
             crate::schema::tx::types::TransactionStatus::Submitted(_) => {
-                TxStatus::Submitted
+                TxStatus::NotFinal(NotFinalTxStatus::Submitted)
             }
             crate::schema::tx::types::TransactionStatus::Success(_) => {
                 TxStatus::Final(FinalTxStatus::Success)
             }
             crate::schema::tx::types::TransactionStatus::PreconfirmationSuccess(_) => {
-                TxStatus::Preconfirmed
+                TxStatus::NotFinal(NotFinalTxStatus::PreconfirmationSuccess)
             }
             crate::schema::tx::types::TransactionStatus::SqueezedOut(_) => {
                 TxStatus::Final(FinalTxStatus::Squeezed)
             }
             crate::schema::tx::types::TransactionStatus::PreconfirmationSqueezedOut(
                 _,
-            ) => TxStatus::Final(FinalTxStatus::Squeezed),
+            ) => TxStatus::Final(FinalTxStatus::PreconfirmationSqueeze),
             crate::schema::tx::types::TransactionStatus::Failure(_) => {
                 TxStatus::Final(FinalTxStatus::Failed)
             }
             crate::schema::tx::types::TransactionStatus::PreconfirmationFailure(_) => {
-                TxStatus::Preconfirmed
+                TxStatus::NotFinal(NotFinalTxStatus::PreconfirmationFailure)
             }
         }
     }