Merge pull request #115 from str4d/windows-typo

librustzcash: Fix typo in Windows parameter init; Correctly map sprout_path. Includes a GitHub actions improvement
This commit is contained in:
str4d 2019-08-26 13:09:57 +01:00 committed by GitHub
commit 563961e606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
name: Rust
on: [push]
on: [push, pull_request]
jobs:
test:

View File

@ -169,7 +169,7 @@ pub extern "system" fn librustzcash_init_zksnark_params(
let sprout_path = if sprout_path.is_null() {
None
} else {
Some(OsStr::from_wide(unsafe {
Some(OsString::from_wide(unsafe {
slice::from_raw_parts(sprout_path, sprout_path_len)
}))
};
@ -179,7 +179,7 @@ pub extern "system" fn librustzcash_init_zksnark_params(
spend_hash,
Path::new(&output_path),
output_hash,
Path::new(&sprout_path),
sprout_path.as_ref().map(|p| Path::new(p)),
sprout_hash,
)
}