From 894421f3b51ff535beb393c7abd61e560e97c933 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 23 Aug 2019 12:01:01 +0100 Subject: [PATCH 1/3] librustzcash: Fix typo in Windows parameter init --- librustzcash/src/rustzcash.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librustzcash/src/rustzcash.rs b/librustzcash/src/rustzcash.rs index 7e7c1a0..bcd6f88 100644 --- a/librustzcash/src/rustzcash.rs +++ b/librustzcash/src/rustzcash.rs @@ -181,7 +181,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) })) }; From 5e706d5d84f1b1ce21c7862d08c7fe0300a971ed Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 23 Aug 2019 12:13:23 +0100 Subject: [PATCH 2/3] Actions: Trigger testing workflow on pull_request --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3ba97ef..fdeb90d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,6 +1,6 @@ name: Rust -on: [push] +on: [push, pull_request] jobs: test: From ba3705cb5e941c71f44f3e362e63414791079dda Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 23 Aug 2019 12:21:47 +0100 Subject: [PATCH 3/3] librustzcash: Correctly map sprout_path --- librustzcash/src/rustzcash.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librustzcash/src/rustzcash.rs b/librustzcash/src/rustzcash.rs index bcd6f88..9f7be87 100644 --- a/librustzcash/src/rustzcash.rs +++ b/librustzcash/src/rustzcash.rs @@ -191,7 +191,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, ) }