change some storage methods

ZcashFoundation · Nov 15, 2023 · 2bda6f9 · 2bda6f9
1 parent a0d981f
commit 2bda6f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/zebra-scan/src/storage.rs b/zebra-scan/src/storage.rs
@@ -43,12 +43,12 @@ impl Storage {
     }
 
     /// Get the results of a sapling key.
-    pub fn get_sapling_results(&self, key: &str) -> Option<&Vec<Hash>> {
-        self.sapling_results.get(key)
+    pub fn get_sapling_results(&self, key: &str) -> Vec<Hash> {
+        self.sapling_results.get(key).cloned().unwrap_or_default()
     }
 
-    /// Get all sapling keys.
-    pub fn get_sapling_keys(&self) -> Vec<SaplingScanningKey> {
-        self.sapling_keys.keys().cloned().collect()
+    /// Get all keys and their birthdays.
+    pub fn get_sapling_keys(&self) -> HashMap<String, Option<Height>> {
+        self.sapling_keys.clone()
     }
 }
diff --git a/zebra-scan/src/tests.rs b/zebra-scan/src/tests.rs
@@ -305,7 +305,7 @@ async fn scanning_fake_blocks_store_key_and_results() -> Result<()> {
 
     // Check key was added
     assert_eq!(s.get_sapling_keys().len(), 1);
-    assert_eq!(s.get_sapling_keys()[0], key_to_be_stored.clone());
+    assert_eq!(s.get_sapling_keys().get(&key_to_be_stored), Some(&None));
 
     let vks: Vec<(&AccountId, &SaplingIvk)> = vec![];
     let nf = Nullifier([7; 32]);
@@ -340,7 +340,7 @@ async fn scanning_fake_blocks_store_key_and_results() -> Result<()> {
 
     // Check the result was added
     assert_eq!(
-        s.get_sapling_results(key_to_be_stored.as_str()).unwrap()[0],
+        s.get_sapling_results(key_to_be_stored.as_str())[0],
         found_transaction_hash
     );