Fix snap build

cuda and chacha features required for chacha_cuda
This commit is contained in:
Stephen Akridge 2018-10-31 15:42:39 -07:00 committed by sakridge
parent ba884b4e36
commit af8dc3fd83
1 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
// for storage mining. Replicators submit storage proofs, validator then bundles them // for storage mining. Replicators submit storage proofs, validator then bundles them
// to submit its proof for mining to be rewarded. // to submit its proof for mining to be rewarded.
#[cfg(feature = "cuda")] #[cfg(all(feature = "chacha", feature = "cuda"))]
use chacha_cuda::chacha_cbc_encrypt_file_many_keys; use chacha_cuda::chacha_cbc_encrypt_file_many_keys;
use entry::EntryReceiver; use entry::EntryReceiver;
use hash::Hash; use hash::Hash;
@ -166,7 +166,7 @@ impl StorageStage {
// TODO: cuda required to generate the reference values // TODO: cuda required to generate the reference values
// but if it is missing, then we need to take care not to // but if it is missing, then we need to take care not to
// process storage mining results. // process storage mining results.
#[cfg(feature = "cuda")] #[cfg(all(feature = "chacha", feature = "cuda"))]
{ {
let mut storage_results = _storage_results.write().unwrap(); let mut storage_results = _storage_results.write().unwrap();
@ -348,10 +348,10 @@ mod tests {
exit.store(true, Ordering::Relaxed); exit.store(true, Ordering::Relaxed);
storage_stage.join().unwrap(); storage_stage.join().unwrap();
#[cfg(not(feature = "cuda"))] #[cfg(not(all(feature = "cuda", feature = "chacha")))]
assert_eq!(result, Hash::default()); assert_eq!(result, Hash::default());
#[cfg(feature = "cuda")] #[cfg(all(feature = "cuda", feature = "chacha"))]
assert_ne!(result, Hash::default()); assert_ne!(result, Hash::default());
remove_dir_all(ledger_path).unwrap(); remove_dir_all(ledger_path).unwrap();