refactor to cleanup duplicate code

mimblewimble · Feb 10, 2020 · de29c50 · de29c50
1 parent dc87c77
commit de29c50
Showing 1 changed file with 2 additions and 22 deletions.
diff --git a/chain/src/store.rs b/chain/src/store.rs
@@ -113,17 +113,7 @@ impl ChainStore {
 
 	/// Get PMMR pos for the given output commitment.
 	pub fn get_output_pos(&self, commit: &Commitment) -> Result<u64, Error> {
-		let res: Result<Option<(u64, u64)>, Error> = self
-			.db
-			.get_ser(&to_key(OUTPUT_POS_PREFIX, &mut commit.as_ref().to_vec()));
-		match res {
-			Ok(None) => Err(Error::NotFoundErr(format!(
-				"Output position for: {:?}",
-				commit
-			))),
-			Ok(Some((pos, _height))) => Ok(pos),
-			Err(e) => Err(e),
-		}
+		self.get_output_pos_height(commit).map(|(pos, _)| pos)
 	}
 
 	/// Get PMMR pos and block height for the given output commitment.
@@ -265,17 +255,7 @@ impl<'a> Batch<'a> {
 
 	/// Get output_pos from index.
 	pub fn get_output_pos(&self, commit: &Commitment) -> Result<u64, Error> {
-		let res: Result<Option<(u64, u64)>, Error> = self
-			.db
-			.get_ser(&to_key(OUTPUT_POS_PREFIX, &mut commit.as_ref().to_vec()));
-		match res {
-			Ok(None) => Err(Error::NotFoundErr(format!(
-				"Output position for: {:?}",
-				commit
-			))),
-			Ok(Some((pos, _height))) => Ok(pos),
-			Err(e) => Err(e),
-		}
+		self.get_output_pos_height(commit).map(|(pos, _)| pos)
 	}
 
 	/// Get output_pos and block height from index.