Refactored sodium struct, created wrapper for crypto and published in crypto service

Cargo.toml

@@ -23,8 +23,11 @@ name = "sovrin"
 path = "src/main.rs"
 
 [features]
-default = ["bn_openssl"]
+default = ["bn_openssl", "ed25519_sodium", "base58_rust_base58", "xsalsa20_sodium"]
 bn_openssl = ["openssl", "int_traits"]
+ed25519_sodium = ["sodiumoxide"]
+base58_rust_base58 = ["rust-base58"]
+xsalsa20_sodium = ["sodiumoxide"]
 
 [dependencies]
 int_traits = { version = "0.1.1", optional = true }
@@ -35,8 +38,8 @@ openssl = { version = "0.9.9", optional = true }
 milagro-crypto = "0.1.0"
 rand = "0.3"
 rusqlite = "0.10.1"
-rust-base58 = "0.0.4"
+rust-base58 = {version = "0.0.4", optional = true}
 rustc-serialize = "0.3"
-sodiumoxide = "0.0.14"
+sodiumoxide = {version = "0.0.14", optional = true}
 zmq = "0.8.1"
 lazy_static = "0.2"

src/services/crypto/anoncreds/mod.rs

@@ -8,15 +8,15 @@ use services::crypto::anoncreds::issuer::Issuer;
 use services::crypto::anoncreds::prover::Prover;
 use services::crypto::anoncreds::verifier::Verifier;
 
-pub struct AnoncredsService {
+pub struct Anoncreds {
     issuer: Issuer,
     prover: Prover,
     verifier: Verifier
 }
 
-impl AnoncredsService {
-    pub fn new() -> AnoncredsService {
-        AnoncredsService {
+impl Anoncreds {
+    pub fn new() -> Anoncreds {
+        Anoncreds {
             issuer: Issuer::new(),
             prover: Prover::new(),
             verifier: Verifier::new()

src/services/crypto/mod.rs

@@ -1,21 +1,26 @@
 pub mod helpers;
 pub mod anoncreds;
-pub mod ed25519;
 pub mod wrappers;
 
-use self::anoncreds::AnoncredsService;
-use self::ed25519::ED25519;
+use self::anoncreds::Anoncreds;
+use self::wrappers::base58::Base58;
+use self::wrappers::ed25519::ED25519;
+use self::wrappers::xsalsa20::XSalsa20;
 
 pub struct CryptoService {
+    anoncreds: Anoncreds,
+    base58: Base58,
     ed25519: ED25519,
-    anoncreds: AnoncredsService
+    xsalsa20: XSalsa20
 }
 
 impl CryptoService {
     pub fn new() -> CryptoService {
         CryptoService {
+            anoncreds: Anoncreds::new(),
+            base58: Base58::new(),
             ed25519: ED25519::new(),
-            anoncreds: AnoncredsService::new()
+            xsalsa20: XSalsa20::new()
         }
     }
 }

src/services/crypto/wrappers/base58/rust_base58.rs

@@ -0,0 +1,44 @@
+extern crate rust_base58;
+
+use errors::crypto::CryptoError;
+
+use self::rust_base58::{ToBase58, FromBase58};
+
+pub struct Base58 {}
+
+impl Base58 {
+    pub fn new() -> Base58 {
+        Base58 {}
+    }
+
+    pub fn encode(&self, doc: &[u8]) -> String {
+        doc.to_base58()
+    }
+
+    pub fn decode(&self, doc: &str) -> Result<Vec<u8>, CryptoError> {
+        doc.from_base58()
+            .map_err(|err| CryptoError::InvalidStructure(format!("{}", err)))
+    }
+}
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn encode_works() {
+        let base58 = Base58::new();
+        let result = base58.encode(&[1, 2, 3]);
+        assert_eq!("Ldp", &result, "Got unexpected data");
+    }
+
+    #[test]
+    fn decode_works() {
+        let base58 = Base58::new();
+        let result = base58.decode("Ldp");
+
+        assert!(result.is_ok(), "Got error");
+        assert_eq!(&[1, 2, 3], &result.unwrap()[..], "Get unexpected data");
+    }
+}