fix: use Account instead of AccountDetails in store

0xPolygonMiden · Apr 4, 2024 · 76504e0 · 76504e0
1 parent 30441e0
commit 76504e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/store/src/db/mod.rs b/store/src/db/mod.rs
@@ -2,6 +2,7 @@ use std::fs::{self, create_dir_all};
 
 use deadpool_sqlite::{Config as SqliteConfig, Hook, HookError, Pool, Runtime};
 use miden_objects::{
+    accounts::Account,
     crypto::{hash::rpo::RpoDigest, merkle::MerklePath, utils::Deserializable},
     notes::Nullifier,
     transaction::AccountDetails,
@@ -36,7 +37,7 @@ pub struct AccountInfo {
     pub account_id: AccountId,
     pub account_hash: RpoDigest,
     pub block_num: BlockNumber,
-    pub details: Option<AccountDetails>,
+    pub details: Option<Account>,
 }
 
 #[derive(Debug, PartialEq)]

diff --git a/store/src/db/sql.rs b/store/src/db/sql.rs
@@ -2,6 +2,7 @@
 use std::rc::Rc;
 
 use miden_objects::{
+    accounts::Account,
     crypto::{hash::rpo::RpoDigest, merkle::MerklePath},
     notes::Nullifier,
     transaction::AccountDetails,
@@ -46,7 +47,7 @@ pub fn select_accounts(conn: &mut Connection) -> Result<Vec<AccountInfo>> {
         let account_hash_data = row.get_ref(1)?.as_blob()?;
         let account_hash = RpoDigest::read_from_bytes(account_hash_data)?;
         let block_num = row.get(2)?;
-        let details = <Option<AccountDetails>>::read_from_bytes(row.get_ref(3)?.as_bytes()?)?;
+        let details = <Option<Account>>::read_from_bytes(row.get_ref(3)?.as_bytes()?)?;
 
         accounts.push(AccountInfo {
             account_id,
@@ -120,7 +121,7 @@ pub fn select_accounts_by_block_range(
         let account_hash_data = row.get_ref(1)?.as_blob()?;
         let account_hash = RpoDigest::read_from_bytes(account_hash_data)?;
         let block_num = row.get(2)?;
-        let details = <Option<AccountDetails>>::read_from_bytes(row.get_ref(3)?.as_bytes()?)?;
+        let details = <Option<Account>>::read_from_bytes(row.get_ref(3)?.as_bytes()?)?;
 
         result.push(AccountInfo {
             account_id,