Merge pull request #1102 from 0xMimir/update/transactionStatus

Added enum for graphql transaction status

Author: 0xMimir

node/native/src/graphql/mod.rs

@@ -19,11 +19,13 @@ use openmina_core::consensus::ConsensusConstants;
 use openmina_core::constants::constraint_constants;
 use openmina_node_common::rpc::RpcSender;
 use std::str::FromStr;
+use transaction::GraphQLTransactionStatus;
 use warp::{Filter, Rejection, Reply};
 
 pub mod account;
 pub mod block;
 pub mod constants;
+pub mod transaction;
 pub mod zkapp;
 
 #[derive(Debug, thiserror::Error)]
@@ -236,7 +238,7 @@ impl Query {
         payment: Option<String>,
         zkapp_transaction: Option<String>,
         context: &Context,
-    ) -> juniper::FieldResult<String> {
+    ) -> juniper::FieldResult<GraphQLTransactionStatus> {
         if payment.is_some() && zkapp_transaction.is_some() {
             return Err(Error::Custom(
                 "Cannot provide both payment and zkapp transaction".to_string(),
@@ -263,7 +265,8 @@ impl Query {
             .oneshot_request(RpcRequest::TransactionStatusGet(tx))
             .await
             .ok_or(Error::StateMachineEmptyResponse)?;
-        Ok(res.to_string())
+
+        Ok(GraphQLTransactionStatus::from(res))
     }
 
     /// Retrieve a block with the given state hash or height, if contained in the transition frontier

node/native/src/graphql/transaction.rs

@@ -0,0 +1,20 @@
+use juniper::GraphQLEnum;
+use node::rpc::TransactionStatus;
+
+#[derive(Clone, Copy, Debug, GraphQLEnum)]
+#[allow(non_camel_case_types)]
+pub enum GraphQLTransactionStatus {
+    INCLUDED,
+    PENDING,
+    UNKNOWN,
+}
+
+impl From<TransactionStatus> for GraphQLTransactionStatus {
+    fn from(value: TransactionStatus) -> Self {
+        match value {
+            TransactionStatus::Included => Self::INCLUDED,
+            TransactionStatus::Pending => Self::PENDING,
+            TransactionStatus::Unknown => Self::UNKNOWN,
+        }
+    }
+}