(feat/graphql): fix account endpoint

Author: vlad9486

node/native/src/graphql/mod.rs

@@ -239,16 +239,20 @@ struct Query;
 impl Query {
     async fn account(
         public_key: String,
-        token: String,
+        token: Option<String>,
         context: &Context,
     ) -> juniper::FieldResult<account::GraphQLAccount> {
-        let token_id = TokenIdKeyHash::from_str(&token)?;
         let public_key = AccountPublicKey::from_str(&public_key)?;
+        let req = match token {
+            None => AccountQuery::SinglePublicKey(public_key),
+            Some(token) => {
+                let token_id = TokenIdKeyHash::from_str(&token)?;
+                AccountQuery::PubKeyWithTokenId(public_key, token_id)
+            }
+        };
         let accounts: Vec<Account> = context
             .rpc_sender
-            .oneshot_request(RpcRequest::LedgerAccountsGet(
-                AccountQuery::PubKeyWithTokenId(public_key, token_id),
-            ))
+            .oneshot_request(RpcRequest::LedgerAccountsGet(req))
             .await
             .ok_or(Error::StateMachineEmptyResponse)?;
 

node/src/ledger/ledger_manager.rs

@@ -236,9 +236,9 @@ impl LedgerRequest {
                     }
                     LedgerReadRequest::AccountsForRpc(rpc_id, ledger_hash, account_query) => {
                         let res = match &account_query {
+                            AccountQuery::All => ledger_ctx.get_accounts_for_rpc(ledger_hash, None),
                             AccountQuery::SinglePublicKey(public_key) => ledger_ctx
                                 .get_accounts_for_rpc(ledger_hash, Some(public_key.clone())),
-                            AccountQuery::All => ledger_ctx.get_accounts_for_rpc(ledger_hash, None),
                             AccountQuery::PubKeyWithTokenId(public_key, token_id_key_hash) => {
                                 let id = AccountId {
                                     public_key: public_key.clone().try_into().unwrap(),

node/src/rpc/rpc_actions.rs

@@ -251,8 +251,8 @@ pub enum RpcAction {
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 pub enum AccountQuery {
-    SinglePublicKey(AccountPublicKey),
     All,
+    SinglePublicKey(AccountPublicKey),
     PubKeyWithTokenId(AccountPublicKey, TokenIdKeyHash),
 }
 

node/src/rpc_effectful/rpc_effectful_effects.rs

@@ -639,9 +639,9 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta<RpcE
             accounts,
             account_query,
         } => {
+            // Is this todo still relevant?
             // TODO(adonagy): maybe something more effective?
             match account_query {
-                AccountQuery::SinglePublicKey(_pk) => todo!(),
                 // all the accounts for the FE in Slim form
                 AccountQuery::All => {
                     let mut accounts: BTreeMap<CompressedPubKey, Account> = accounts
@@ -683,7 +683,7 @@ pub fn rpc_effects<S: Service>(store: &mut Store<S>, action: ActionWithMeta<RpcE
                     )
                 }
                 // for the graphql endpoint
-                AccountQuery::PubKeyWithTokenId(..) => {
+                AccountQuery::SinglePublicKey(..) | AccountQuery::PubKeyWithTokenId(..) => {
                     respond_or_log!(
                         store.service().respond_ledger_accounts(rpc_id, accounts),
                         meta.time()