Merge pull request #864 from zcash/drop-directories
Replace `directories` dependency with `home, known-folders, xdg`
This commit is contained in:
commit
fe80d895a0
|
@ -7,6 +7,11 @@ and this library adheres to Rust's notion of
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [0.12.1] - 2023-06-28
|
||||||
|
### Changed
|
||||||
|
- Replaced internal `directories` dependency which now transitively depends on
|
||||||
|
MPL-licensed code.
|
||||||
|
|
||||||
## [0.12.0] - 2023-06-06
|
## [0.12.0] - 2023-06-06
|
||||||
### Changed
|
### Changed
|
||||||
- Bumped dependencies to `incrementalmerkletree 0.4`, `zcash_primitives 0.12`
|
- Bumped dependencies to `incrementalmerkletree 0.4`, `zcash_primitives 0.12`
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "zcash_proofs"
|
name = "zcash_proofs"
|
||||||
description = "Zcash zk-SNARK circuits and proving APIs"
|
description = "Zcash zk-SNARK circuits and proving APIs"
|
||||||
version = "0.12.0"
|
version = "0.12.1"
|
||||||
authors = [
|
authors = [
|
||||||
"Jack Grigg <jack@z.cash>",
|
"Jack Grigg <jack@z.cash>",
|
||||||
]
|
]
|
||||||
|
@ -34,9 +34,11 @@ tracing = "0.1"
|
||||||
# Dependencies used internally:
|
# Dependencies used internally:
|
||||||
# (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
|
# (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.)
|
||||||
blake2b_simd = "1"
|
blake2b_simd = "1"
|
||||||
directories = { version = "5", optional = true }
|
home = { version = "0.5", optional = true }
|
||||||
|
known-folders = { version = "1", optional = true }
|
||||||
redjubjub = "0.7"
|
redjubjub = "0.7"
|
||||||
wagyu-zcash-parameters = { version = "0.2", optional = true }
|
wagyu-zcash-parameters = { version = "0.2", optional = true }
|
||||||
|
xdg = { version = "2.5", optional = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
byteorder = "1"
|
byteorder = "1"
|
||||||
|
@ -49,6 +51,7 @@ pprof = { version = "0.11", features = ["criterion", "flamegraph"] } # MSRV 1.56
|
||||||
[features]
|
[features]
|
||||||
default = ["local-prover", "multicore"]
|
default = ["local-prover", "multicore"]
|
||||||
bundled-prover = ["wagyu-zcash-parameters"]
|
bundled-prover = ["wagyu-zcash-parameters"]
|
||||||
|
directories = ["dep:home", "dep:known-folders", "dep:xdg"]
|
||||||
download-params = ["minreq", "directories"]
|
download-params = ["minreq", "directories"]
|
||||||
local-prover = ["directories"]
|
local-prover = ["directories"]
|
||||||
multicore = ["bellman/multicore", "zcash_primitives/multicore"]
|
multicore = ["bellman/multicore", "zcash_primitives/multicore"]
|
||||||
|
|
|
@ -15,8 +15,6 @@ use std::fs::File;
|
||||||
use std::io::{self, BufReader};
|
use std::io::{self, BufReader};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
#[cfg(feature = "directories")]
|
|
||||||
use directories::BaseDirs;
|
|
||||||
#[cfg(feature = "directories")]
|
#[cfg(feature = "directories")]
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
@ -77,13 +75,23 @@ pub struct SaplingParameterPaths {
|
||||||
#[cfg(feature = "directories")]
|
#[cfg(feature = "directories")]
|
||||||
#[cfg_attr(docsrs, doc(cfg(feature = "directories")))]
|
#[cfg_attr(docsrs, doc(cfg(feature = "directories")))]
|
||||||
pub fn default_params_folder() -> Option<PathBuf> {
|
pub fn default_params_folder() -> Option<PathBuf> {
|
||||||
BaseDirs::new().map(|base_dirs| {
|
#[cfg(windows)]
|
||||||
if cfg!(any(windows, target_os = "macos")) {
|
{
|
||||||
base_dirs.data_dir().join("ZcashParams")
|
use known_folders::{get_known_folder_path, KnownFolder};
|
||||||
} else {
|
get_known_folder_path(KnownFolder::RoamingAppData).map(|base| base.join("ZcashParams"))
|
||||||
base_dirs.home_dir().join(".zcash-params")
|
}
|
||||||
}
|
|
||||||
})
|
#[cfg(target_os = "macos")]
|
||||||
|
{
|
||||||
|
xdg::BaseDirectories::new()
|
||||||
|
.ok()
|
||||||
|
.map(|base_dirs| base_dirs.get_data_home().join("ZcashParams"))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(any(windows, target_os = "macos")))]
|
||||||
|
{
|
||||||
|
home::home_dir().map(|base| base.join(".zcash-params"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download the Zcash Sapling parameters if needed, and store them in the default location.
|
/// Download the Zcash Sapling parameters if needed, and store them in the default location.
|
||||||
|
|
Loading…
Reference in New Issue