Some simple Option / Result / iterator pattern simplifications (#3205)

2020-01-29 09:20:57 -05:00
parent 616dad43fd
commit dcdbdd4bcc
10 changed files with 39 additions and 57 deletions
@@ -334,10 +334,10 @@ impl OutputPrintable {
 	}

 	pub fn range_proof(&self) -> Result<pedersen::RangeProof, ser::Error> {
-		let proof_str = match self.proof.clone() {
-			Some(p) => p,
-			None => return Err(ser::Error::HexError(format!("output range_proof missing"))),
-		};
+		let proof_str = self
+			.proof
+			.clone()
+			.ok_or_else(|| ser::Error::HexError(format!("output range_proof missing")))?;

 		let p_vec = util::from_hex(proof_str)
 			.map_err(|_| ser::Error::HexError(format!("invalid output range_proof")))?;