diff options
author | Katharina Fey <kookie@spacekookie.de> | 2017-12-15 16:59:26 +0100 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2017-12-15 16:59:26 +0100 |
commit | 109c574e77ae75442492efc6eb8c61804d8193a8 (patch) | |
tree | 9218d3adc606f59c36cb5752787a4248c24c3b62 /src | |
parent | 1a6c042fc937d76cc0d814d85727b47c187b920b (diff) |
Doing that crypto -> securit refactoring at last
Diffstat (limited to 'src')
-rw-r--r-- | src/main.rs | 2 | ||||
-rw-r--r-- | src/security/encoding.rs (renamed from src/crypto/encoding.rs) | 0 | ||||
-rw-r--r-- | src/security/engine.rs (renamed from src/crypto/engine.rs) | 0 | ||||
-rw-r--r-- | src/security/hash.rs (renamed from src/crypto/hash.rs) | 0 | ||||
-rw-r--r-- | src/security/key.rs (renamed from src/crypto/key.rs) | 0 | ||||
-rw-r--r-- | src/security/mod.rs (renamed from src/crypto/mod.rs) | 0 | ||||
-rw-r--r-- | src/security/random.rs (renamed from src/crypto/random.rs) | 0 | ||||
-rw-r--r-- | src/test/mod.rs | 7 | ||||
-rw-r--r-- | src/vault/mod.rs | 4 |
9 files changed, 9 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs index ae5570c..1b0c2ae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ extern crate generic_array; pub mod record; pub mod vault; -mod crypto; +mod security; mod test; use vault::*; diff --git a/src/crypto/encoding.rs b/src/security/encoding.rs index f0cd054..f0cd054 100644 --- a/src/crypto/encoding.rs +++ b/src/security/encoding.rs diff --git a/src/crypto/engine.rs b/src/security/engine.rs index 33ed62b..33ed62b 100644 --- a/src/crypto/engine.rs +++ b/src/security/engine.rs diff --git a/src/crypto/hash.rs b/src/security/hash.rs index a54ec50..a54ec50 100644 --- a/src/crypto/hash.rs +++ b/src/security/hash.rs diff --git a/src/crypto/key.rs b/src/security/key.rs index 7e6fbd3..7e6fbd3 100644 --- a/src/crypto/key.rs +++ b/src/security/key.rs diff --git a/src/crypto/mod.rs b/src/security/mod.rs index 38a5137..38a5137 100644 --- a/src/crypto/mod.rs +++ b/src/security/mod.rs diff --git a/src/crypto/random.rs b/src/security/random.rs index bc96032..bc96032 100644 --- a/src/crypto/random.rs +++ b/src/security/random.rs diff --git a/src/test/mod.rs b/src/test/mod.rs index 6eee106..5ec92ac 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -6,10 +6,13 @@ #![allow(unused)] use record::{Record, Payload, Version, Header}; -use crypto::engine::CryptoEngine; +use security::engine::CryptoEngine; use vault::Vault; use serde_json; +use std::fs; +use std::path::Path; + #[test] fn serialise_record_simple() { let r = Record::new("name", "category"); @@ -101,5 +104,7 @@ fn storage_lifecycle() { v.sync(); let v2: Vault = Vault::load("lockchain_testing", "/tmp/", "password"); + + fs::remove_dir_all(Path::new("/tmp/lockchain_testing.vault/")).unwrap(); assert_eq!(v.records, v2.records); }
\ No newline at end of file diff --git a/src/vault/mod.rs b/src/vault/mod.rs index cca9d26..bce6be2 100644 --- a/src/vault/mod.rs +++ b/src/vault/mod.rs @@ -18,8 +18,8 @@ use std::path::PathBuf; use std::fs::File; use std::fs; -use crypto::engine::CryptoEngine; -use crypto::key; +use security::engine::CryptoEngine; +use security::key; use record::{Record, Payload}; use serde_json; |