[r2r] Add checksum verification of Zcash params files #1549
Conversation
…ion_of_Zcash_params
…ion_of_Zcash_params # Conflicts: # mm2src/coins/z_coin/z_coin_errors.rs
…ion_of_Zcash_params
laruh
changed the title
laruh
changed the title
|
@ozkanonur Could you take a look too, please? |
mm2src/coins/z_coin.rs
Outdated
| /// open file and calculate its sha256 digest as lowercase hex string | ||
| fn sha256_digest(path: &PathBuf) -> Result<String, ZCoinBuildError> { | ||
| let input = File::open(path)?; | ||
| let mut reader = BufReader::new(input); | ||
|
|
||
| let digest = { | ||
| let mut hasher = Sha256::new(); | ||
| let mut buffer = [0; 1024]; | ||
| loop { | ||
| let count = reader.read(&mut buffer)?; | ||
| if count == 0 { | ||
| break; | ||
| } | ||
| hasher.update(&buffer[..count]); | ||
| } | ||
| format!("{:x}", hasher.finalize()) | ||
| }; | ||
| Ok(digest) | ||
| } |
There was a problem hiding this comment.
I think this looks like a general purpose function that could be placed in common module for reusability.
mm2src/coins/z_coin.rs
Outdated
| let (spend_path, output_path) = if params_dir.exists() { | ||
| ( | ||
| params_dir.join(SAPLING_SPEND_NAME), | ||
| params_dir.join(SAPLING_OUTPUT_NAME), | ||
| ) | ||
| } else { | ||
| return Err(ZCoinBuildError::ZCashParamsNotFound); | ||
| }; | ||
| if !(spend_path.exists() && output_path.exists()) { | ||
| return Err(ZCoinBuildError::ZCashParamsNotFound); | ||
| } |
There was a problem hiding this comment.
In my opinion, the following code looks more readable because it includes less blocks.
if !params_dir.exists() {
return Err(ZCoinBuildError::ZCashParamsNotFound);
}
let spend_path = params_dir.join(SAPLING_SPEND_NAME);
let output_path = params_dir.join(SAPLING_OUTPUT_NAME);
if !(spend_path.exists() && output_path.exists()) {
return Err(ZCoinBuildError::ZCashParamsNotFound);
}Just sharing my thought, maybe it's just me :)
There was a problem hiding this comment.
I agree, it looks better.
Done
…ion_of_Zcash_params
laruh
changed the title
laruh
changed the title
mm2src/common/common.rs
Outdated
| @@ -117,6 +117,8 @@ pub mod wio; | |||
|
|
|||
| #[cfg(target_arch = "wasm32")] pub use wasm::*; | |||
|
|
|||
| #[cfg(target_arch = "wasm32")] use std::path::PathBuf; | |||
There was a problem hiding this comment.
It can be imported without any condition. Atm it's imported twice for native and wasm mode.
There was a problem hiding this comment.
I just had this error and recomendation to import std::path::PathBuf. Sorry, what do you mean by condition?
There was a problem hiding this comment.
#[cfg(target_arch = "wasm32")] this is compile-time check which provides conditional compilation.
We have PathBuf imported as
#[cfg(target_arch = "wasm32")] use std::path::PathBuf;and
cfg_native!{ // checks if target isn't wasm
use std::path::PathBuf;
}Because we are using it for both targets, we can import it as it is without any compile-time condition.
There was a problem hiding this comment.
Oh, got it, thanks! It is imported without condition now.
Done.
…ion_of_Zcash_params
related to ARRR integration. #927