Big discrepancy in fields size on enum

Author: rodoufu

src/agent/legacy_schedule.rs

@@ -387,7 +387,7 @@ mod tests {
         let ok_datetimes = [
             NaiveDate::from_ymd_opt(2023, 11, 20)
                 .unwrap()
-                .and_time(MAX_TIME_INSTANT)
+                .and_time(MAX_TIME_INSTANT.clone())
                 .and_local_timezone(Tz::Europe__Amsterdam)
                 .unwrap(),
             NaiveDateTime::parse_from_str("2023-11-21 00:00", format)?
@@ -404,7 +404,7 @@ mod tests {
             // confused for Wednesday 00:00 which is open.
             NaiveDate::from_ymd_opt(2023, 11, 21)
                 .unwrap()
-                .and_time(MAX_TIME_INSTANT)
+                .and_time(MAX_TIME_INSTANT.clone())
                 .and_local_timezone(Tz::Europe__Amsterdam)
                 .unwrap(),
         ];

src/agent/state.rs

@@ -496,7 +496,8 @@ mod tests {
                             )
                             .unwrap(),
                         ],
-                    },
+                    }
+                    .into(),
                 ),
                 (
                     solana_sdk::pubkey::Pubkey::from_str(
@@ -557,7 +558,8 @@ mod tests {
                             )
                             .unwrap(),
                         ],
-                    },
+                    }
+                    .into(),
                 ),
             ]),
             price_accounts:   HashMap::from([

src/agent/state/global.rs

@@ -34,8 +34,8 @@ use {
 /// from the primary network.
 #[derive(Debug, Clone, Default)]
 pub struct AllAccountsData {
-    pub product_accounts: HashMap<Pubkey, ProductEntry>,
-    pub price_accounts:   HashMap<Pubkey, PriceEntry>,
+    pub product_accounts: HashMap<Pubkey, Arc<ProductEntry>>,
+    pub price_accounts: HashMap<Pubkey, Arc<PriceEntry>>,
 }
 
 /// AllAccountsMetadata contains the metadata for all the price and product accounts.
@@ -56,15 +56,15 @@ pub struct ProductAccountMetadata {
     pub price_accounts: Vec<Pubkey>,
 }
 
-impl From<ProductEntry> for ProductAccountMetadata {
-    fn from(product_account: ProductEntry) -> Self {
+impl From<&ProductEntry> for ProductAccountMetadata {
+    fn from(product_account: &ProductEntry) -> Self {
         ProductAccountMetadata {
-            attr_dict:      product_account
+            attr_dict: product_account
                 .account_data
                 .iter()
                 .map(|(key, val)| (key.to_owned(), val.to_owned()))
                 .collect(),
-            price_accounts: product_account.price_accounts,
+            price_accounts: product_account.price_accounts.clone(),
         }
     }
 }
@@ -76,8 +76,8 @@ pub struct PriceAccountMetadata {
     pub expo: i32,
 }
 
-impl From<PriceEntry> for PriceAccountMetadata {
-    fn from(price_account: PriceEntry) -> Self {
+impl From<&PriceEntry> for PriceAccountMetadata {
+    fn from(price_account: &PriceEntry) -> Self {
         PriceAccountMetadata {
             expo: price_account.expo,
         }
@@ -88,11 +88,11 @@ impl From<PriceEntry> for PriceAccountMetadata {
 pub enum Update {
     ProductAccountUpdate {
         account_key: Pubkey,
-        account:     ProductEntry,
+        account: Arc<ProductEntry>,
     },
     PriceAccountUpdate {
         account_key: Pubkey,
-        account:     PriceEntry,
+        account: Arc<PriceEntry>,
     },
 }
 
@@ -153,7 +153,7 @@ pub trait GlobalStore {
         &self,
         network: Network,
         price_ids: HashSet<Pubkey>,
-    ) -> Result<HashMap<Pubkey, PriceEntry>>;
+    ) -> Result<HashMap<Pubkey, Arc<PriceEntry>>>;
 }
 
 // Allow downcasting State into GlobalStore for functions that depend on the `GlobalStore` service.
@@ -190,7 +190,7 @@ where
         &self,
         network: Network,
         price_ids: HashSet<Pubkey>,
-    ) -> Result<HashMap<Pubkey, PriceEntry>> {
+    ) -> Result<HashMap<Pubkey, Arc<PriceEntry>>> {
         let account_data = match network {
             Network::Primary => &self.into().account_data_primary,
             Network::Secondary => &self.into().account_data_secondary,
@@ -229,7 +229,7 @@ where
             account_key,
             account,
         } => {
-            let attr_dict = ProductAccountMetadata::from(account.clone()).attr_dict;
+            let attr_dict = ProductAccountMetadata::from(account.as_ref()).attr_dict;
             let maybe_symbol = attr_dict.get("symbol").cloned();
             store.product_metrics.update(account_key, maybe_symbol);
 
@@ -269,7 +269,7 @@ where
                 .write()
                 .await
                 .price_accounts
-                .insert(*account_key, *account);
+                .insert(*account_key, account.clone());
         }
     }
 
@@ -292,7 +292,7 @@ where
                 .write()
                 .await
                 .product_accounts_metadata
-                .insert(*account_key, account.clone().into());
+                .insert(*account_key, account.as_ref().into());
 
             Ok(())
         }
@@ -305,7 +305,7 @@ where
                 .write()
                 .await
                 .price_accounts_metadata
-                .insert(*account_key, (*account).into());
+                .insert(*account_key, account.as_ref().into());
 
             Ok(())
         }

src/agent/state/oracle.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 #[allow(deprecated)]
 use crate::agent::legacy_schedule::LegacySchedule;
 use {
@@ -130,8 +132,8 @@ impl std::ops::Deref for PriceEntry {
 
 #[derive(Default, Debug, Clone)]
 pub struct Data {
-    pub product_accounts:      HashMap<Pubkey, ProductEntry>,
-    pub price_accounts:        HashMap<Pubkey, PriceEntry>,
+    pub product_accounts: HashMap<Pubkey, Arc<ProductEntry>>,
+    pub price_accounts: HashMap<Pubkey, Arc<PriceEntry>>,
     /// publisher => {their permissioned price accounts => price publishing metadata}
     pub publisher_permissions: HashMap<Pubkey, HashMap<Pubkey, PricePublishingMetadata>>,
     pub publisher_buffer_key:  Option<Pubkey>,
@@ -239,14 +241,14 @@ where
             "Observed on-chain price account update.",
         );
 
-        data.price_accounts.insert(*account_key, price_entry);
+        data.price_accounts.insert(*account_key, price_entry.into());
 
         Prices::update_global_price(
             self,
             network,
             &Update::PriceAccountUpdate {
                 account_key: *account_key,
-                account:     price_entry,
+                account: Arc::new(price_entry),
             },
         )
         .await?;
@@ -369,7 +371,7 @@ where
                 network,
                 &Update::PriceAccountUpdate {
                     account_key: *price_account_key,
-                    account:     *price_account,
+                    account: price_account.clone(),
                 },
             )
             .await
@@ -401,7 +403,10 @@ async fn fetch_product_and_price_accounts(
     rpc_client: &RpcClient,
     oracle_program_key: Pubkey,
     max_lookup_batch_size: usize,
-) -> Result<(HashMap<Pubkey, ProductEntry>, HashMap<Pubkey, PriceEntry>)> {
+) -> Result<(
+    HashMap<Pubkey, Arc<ProductEntry>>,
+    HashMap<Pubkey, Arc<PriceEntry>>,
+)> {
     let mut product_entries = HashMap::new();
     let mut price_entries = HashMap::new();
 
@@ -502,7 +507,16 @@ async fn fetch_product_and_price_accounts(
         }
     }
 
-    Ok((product_entries, price_entries))
+    Ok((
+        product_entries
+            .into_iter()
+            .map(|(x, y)| (x, Arc::new(y)))
+            .collect(),
+        price_entries
+            .into_iter()
+            .map(|(x, y)| (x, Arc::new(y)))
+            .collect(),
+    ))
 }
 
 #[instrument(skip(rpc_client, product_key_batch))]