Browse Source

Fixes after feedback

master
Marco Stronati 5 years ago
parent
commit
37531ed747
  1. 8
      librustzcash/src/rustzcash.rs

8
librustzcash/src/rustzcash.rs

@ -143,7 +143,7 @@ pub extern "system" fn librustzcash_init_zksnark_params(
let output_path = Path::new(OsStr::from_bytes(unsafe { let output_path = Path::new(OsStr::from_bytes(unsafe {
slice::from_raw_parts(output_path, output_path_len) slice::from_raw_parts(output_path, output_path_len)
})); }));
let sprout_path = if sprout_path.is_null() && sprout_path_len == 0 { let sprout_path = if sprout_path.is_null() {
None None
} else { } else {
Some(Path::new(OsStr::from_bytes(unsafe { Some(Path::new(OsStr::from_bytes(unsafe {
@ -178,7 +178,7 @@ pub extern "system" fn librustzcash_init_zksnark_params(
OsString::from_wide(unsafe { slice::from_raw_parts(spend_path, spend_path_len) }); OsString::from_wide(unsafe { slice::from_raw_parts(spend_path, spend_path_len) });
let output_path = let output_path =
OsString::from_wide(unsafe { slice::from_raw_parts(output_path, output_path_len) }); OsString::from_wide(unsafe { slice::from_raw_parts(output_path, output_path_len) });
let sprout_path = if sprout_path.is_null() && sprout_path_len == 0 { let sprout_path = if sprout_path.is_null() {
None None
} else { } else {
Some(OsStr::from_wide(unsafe { Some(OsStr::from_wide(unsafe {
@ -215,7 +215,7 @@ fn init_zksnark_params(
.to_str() .to_str()
.expect("hash should be a valid string"); .expect("hash should be a valid string");
let sprout_hash_option = if sprout_path.is_none() { let sprout_hash = if sprout_path.is_none() {
None None
} else { } else {
Some( Some(
@ -232,7 +232,7 @@ fn init_zksnark_params(
output_path, output_path,
output_hash, output_hash,
sprout_path, sprout_path,
sprout_hash_option, sprout_hash,
); );
// Caller is responsible for calling this function once, so // Caller is responsible for calling this function once, so

Loading…
Cancel
Save