f cleaner hash conversion

TheBlueMatt · TheBlueMatt · commit 13dcb0433667 · 2023-08-23T03:42:06.000Z
diff --git a/lightning-block-sync/src/convert.rs b/lightning-block-sync/src/convert.rs
@@ -49,11 +49,9 @@ impl TryInto<BlockHash> for BinaryResponse {
 	type Error = std::io::Error;
 
 	fn try_into(self) -> std::io::Result<BlockHash> {
-		if self.0.len() != 32 {
+		BlockHash::from_slice(&self.0).map_err(|_|
 			Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "bad block hash length"))
-		} else {
-			Ok(BlockHash::from_slice(&self.0).unwrap())
-		}
+		)?
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,9 @@ impl TryInto<BlockHash> for BinaryResponse {`
`49`	`49`	`type Error = std::io::Error;`
`50`	`50`
`51`	`51`	`fn try_into(self) -> std::io::Result<BlockHash> {`
`52`		`- if self.0.len() != 32 {`
	`52`	`+ BlockHash::from_slice(&self.0).map_err(\|_\|`
`53`	`53`	`Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "bad block hash length"))`
`54`		`- } else {`
`55`		`- Ok(BlockHash::from_slice(&self.0).unwrap())`
`56`		`- }`
	`54`	`+ )?`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`