Make latest_round accept one or many data ids

contracts/data-feeds/data-feeds-cache/src/contract.rs

@@ -30,22 +30,22 @@ impl DataFeedsCache {
 
 #[contractimpl]
 impl DataFeedsCacheReader for DataFeedsCache {
-    fn latest_round(env: Env, data_id: BytesN<16>) -> Result<Option<RoundData>, CacheError> {
-        let Some(state) = feed::feed_state(&env, &data_id) else {
-            return Ok(None);
-        };
-        if state.frozen {
-            return Err(CacheError::FeedFrozen);
+    fn latest_round(
+        env: Env,
+        data_ids: Vec<BytesN<16>>,
+    ) -> Result<Vec<Option<RoundData>>, CacheError> {
+        let mut rounds = Vec::new(&env);
+        for data_id in data_ids.iter() {
+            rounds.push_back(feed::feed_state(&env, &data_id).map(|state| state.latest_round));
         }
-        Ok(Some(state.latest_round))
+        Ok(rounds)
     }
 
     fn get_round(
         env: Env,
         data_id: BytesN<16>,
         round_id: u64,
     ) -> Result<Option<RoundData>, CacheError> {
-        reject_frozen(&env, &data_id)?;
         Ok(feed::round(&env, &data_id, round_id))
     }
 
@@ -55,7 +55,6 @@ impl DataFeedsCacheReader for DataFeedsCache {
         from: u64,
         to: u64,
     ) -> Result<Vec<RoundData>, CacheError> {
-        reject_frozen(&env, &data_id)?;
         Ok(feed::range(&env, &data_id, from, to))
     }
 
@@ -65,34 +64,40 @@ impl DataFeedsCacheReader for DataFeedsCache {
         timestamp: u64,
         bound: Bound,
     ) -> Result<Option<RoundData>, CacheError> {
-        reject_frozen(&env, &data_id)?;
         Ok(feed::find_round(&env, &data_id, timestamp, bound))
     }
 
-    fn decimals(env: Env, data_id: BytesN<16>) -> Result<Option<u32>, CacheError> {
-        reject_frozen(&env, &data_id)?;
-        Ok(feed::decimals(&env, &data_id))
-    }
-
-    fn description(env: Env, data_id: BytesN<16>) -> Result<Option<String>, CacheError> {
-        reject_frozen(&env, &data_id)?;
-        Ok(feed::description(&env, &data_id))
+    fn decimals(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<Option<u32>>, CacheError> {
+        let mut out = Vec::new(&env);
+        for data_id in data_ids.iter() {
+            out.push_back(feed::decimals(&env, &data_id));
+        }
+        Ok(out)
     }
 
-    fn is_configured(env: Env, data_id: BytesN<16>) -> Result<bool, CacheError> {
-        Ok(feed::configured(&env, &data_id))
+    fn description(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<Option<String>>, CacheError> {
+        let mut out = Vec::new(&env);
+        for data_id in data_ids.iter() {
+            out.push_back(feed::description(&env, &data_id));
+        }
+        Ok(out)
     }
 
-    fn is_frozen(env: Env, data_id: BytesN<16>) -> bool {
-        feed::is_frozen(&env, &data_id)
+    fn is_configured(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<bool>, CacheError> {
+        let mut out = Vec::new(&env);
+        for data_id in data_ids.iter() {
+            out.push_back(feed::configured(&env, &data_id));
+        }
+        Ok(out)
     }
-}
 
-fn reject_frozen(env: &Env, data_id: &DataId) -> Result<(), CacheError> {
-    if feed::is_frozen(env, data_id) {
-        return Err(CacheError::FeedFrozen);
+    fn is_frozen(env: Env, data_ids: Vec<BytesN<16>>) -> Vec<bool> {
+        let mut out = Vec::new(&env);
+        for data_id in data_ids.iter() {
+            out.push_back(feed::is_frozen(&env, &data_id));
+        }
+        out
     }
-    Ok(())
 }
 
 #[contractimpl]

contracts/data-feeds/data-feeds-cache/src/interface/reader.rs

@@ -5,7 +5,10 @@ use crate::interface::CacheError;
 
 #[contractclient(name = "DataFeedsCacheReaderClient")]
 pub trait DataFeedsCacheReader {
-    fn latest_round(env: Env, data_id: BytesN<16>) -> Result<Option<RoundData>, CacheError>;
+    fn latest_round(
+        env: Env,
+        data_ids: Vec<BytesN<16>>,
+    ) -> Result<Vec<Option<RoundData>>, CacheError>;
 
     fn get_round(
         env: Env,
@@ -27,11 +30,11 @@ pub trait DataFeedsCacheReader {
         bound: Bound,
     ) -> Result<Option<RoundData>, CacheError>;
 
-    fn decimals(env: Env, data_id: BytesN<16>) -> Result<Option<u32>, CacheError>;
+    fn decimals(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<Option<u32>>, CacheError>;
 
-    fn description(env: Env, data_id: BytesN<16>) -> Result<Option<String>, CacheError>;
+    fn description(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<Option<String>>, CacheError>;
 
-    fn is_configured(env: Env, data_id: BytesN<16>) -> Result<bool, CacheError>;
+    fn is_configured(env: Env, data_ids: Vec<BytesN<16>>) -> Result<Vec<bool>, CacheError>;
 
-    fn is_frozen(env: Env, data_id: BytesN<16>) -> bool;
+    fn is_frozen(env: Env, data_ids: Vec<BytesN<16>>) -> Vec<bool>;
 }