From 7005f4d465418f100fdd4f4b5d6402fafbdedaaa Mon Sep 17 00:00:00 2001
From: "Y. T. Chung" <zonyitoo@gmail.com>
Date: Thu, 16 Feb 2017 02:08:14 +0800
Subject: [PATCH] fixed test

---
 src/crypto/cipher.rs  | 18 +++++++++---------
 src/crypto/crypto.rs  |  2 +-
 src/crypto/openssl.rs |  4 +---
 src/crypto/rc4_md5.rs |  2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/crypto/cipher.rs b/src/crypto/cipher.rs
index ee2dfed5..fca081d7 100644
--- a/src/crypto/cipher.rs
+++ b/src/crypto/cipher.rs
@@ -341,21 +341,21 @@ impl Display for CipherType {
 
 #[cfg(test)]
 mod test_cipher {
-    use crypto::cipher::{Cipher, CipherType, with_type};
+    use crypto::{StreamCipher, CipherType, new_stream};
     use crypto::CryptoMode;
 
     #[test]
     fn test_get_cipher() {
         let key = CipherType::Aes128Cfb.bytes_to_key(b"PassWORD");
         let iv = CipherType::Aes128Cfb.gen_init_vec();
-        let mut encryptor = with_type(CipherType::Aes128Cfb,
-                                      &key[0..],
-                                      &iv[0..],
-                                      CryptoMode::Encrypt);
-        let mut decryptor = with_type(CipherType::Aes128Cfb,
-                                      &key[0..],
-                                      &iv[0..],
-                                      CryptoMode::Decrypt);
+        let mut encryptor = new_stream(CipherType::Aes128Cfb,
+                                       &key[0..],
+                                       &iv[0..],
+                                       CryptoMode::Encrypt);
+        let mut decryptor = new_stream(CipherType::Aes128Cfb,
+                                       &key[0..],
+                                       &iv[0..],
+                                       CryptoMode::Decrypt);
         let message = "HELLO WORLD";
 
         let mut encrypted_msg = Vec::new();
diff --git a/src/crypto/crypto.rs b/src/crypto/crypto.rs
index 7a66bcf2..169acc85 100644
--- a/src/crypto/crypto.rs
+++ b/src/crypto/crypto.rs
@@ -157,7 +157,7 @@ impl AeadDecryptor for CryptoAeadCrypto {
 
 #[cfg(test)]
 mod test {
-    use crypto::cipher::{Cipher, CipherType};
+    use crypto::{StreamCipher, CipherType};
     use super::*;
 
     #[test]
diff --git a/src/crypto/openssl.rs b/src/crypto/openssl.rs
index 72a73226..bb87be3b 100644
--- a/src/crypto/openssl.rs
+++ b/src/crypto/openssl.rs
@@ -93,10 +93,8 @@ impl OpenSSLCrypto {
 /// *Note: This behavior works just the same as the official version of shadowsocks.*
 ///
 /// ```rust
-/// use shadowsocks::crypto::CryptoMode;
-/// use shadowsocks::crypto::cipher::CipherType;
+/// use shadowsocks::crypto::{CryptoMode, StreamCipher, CipherType};
 /// use shadowsocks::crypto::openssl::OpenSSLCipher;
-/// use shadowsocks::crypto::cipher::Cipher;
 ///
 /// let method = CipherType::Aes128Cfb;
 ///
diff --git a/src/crypto/rc4_md5.rs b/src/crypto/rc4_md5.rs
index fe2e988b..24d2b1c6 100644
--- a/src/crypto/rc4_md5.rs
+++ b/src/crypto/rc4_md5.rs
@@ -58,7 +58,7 @@ unsafe impl Send for Rc4Md5Cipher {}
 #[cfg(test)]
 mod test {
     use super::*;
-    use crypto::cipher::{Cipher, CipherType};
+    use crypto::{StreamCipher, CipherType};
     use crypto::CryptoMode;
 
     #[test]