rename height unwrap fn

ZcashFoundation · Oct 30, 2020 · b6b56ca · b6b56ca
1 parent 69fe187
commit b6b56ca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/zebra-state/src/request.rs b/zebra-state/src/request.rs
@@ -24,7 +24,7 @@ pub enum HashOrHeight {
 impl HashOrHeight {
     /// Unwrap the inner height or attempt to retrieve the height for a given
     /// hash if one exists.
-    pub fn unwrap_height<F>(self, op: F) -> Option<block::Height>
+    pub fn height_or_else<F>(self, op: F) -> Option<block::Height>
     where
         F: FnOnce(block::Hash) -> Option<block::Height>,
     {

diff --git a/zebra-state/src/service/memory_state.rs b/zebra-state/src/service/memory_state.rs
@@ -553,7 +553,7 @@ impl NonFinalizedState {
     pub fn block(&self, hash_or_height: HashOrHeight) -> Option<Arc<Block>> {
         let best_chain = self.best_chain()?;
         let height =
-            hash_or_height.unwrap_height(|hash| best_chain.height_by_hash.get(&hash).cloned())?;
+            hash_or_height.height_or_else(|hash| best_chain.height_by_hash.get(&hash).cloned())?;
 
         best_chain.blocks.get(&height).cloned()
     }

diff --git a/zebra-state/src/sled_state.rs b/zebra-state/src/sled_state.rs
@@ -337,7 +337,7 @@ impl FinalizedState {
 
     /// Returns the given block if it exists.
     pub fn block(&self, hash_or_height: HashOrHeight) -> Option<Arc<Block>> {
-        let height = hash_or_height.unwrap_height(|hash| self.height_by_hash.zs_get(&hash))?;
+        let height = hash_or_height.height_or_else(|hash| self.height_by_hash.zs_get(&hash))?;
 
         self.block_by_height.zs_get(&height)
     }