make all tests passing (still need to add string tests for the new struct)

Author: tmthecoder

src/lib.rs

@@ -17,13 +17,13 @@
 //!     let hotp_str = HOTP::default_from_utf8(secret);
 //!     // Get an otp with the given counter
 //!     let otp_from_str = hotp_str.get_otp(counter);
-//!     println!("The otp from hotp_str: {}", otp_from_str);
+//!     println!("The otp from hotp_str: {}", otp_from_str.as_string());
 //!
 //!     // Alternatively, get a HOTP instance with a '&[u8]' secret
 //!     let hotp_bytes = HOTP::new(secret.as_bytes(), 6);
 //!     // Get an otp with the given counter
 //!     let otp_from_bytes = hotp_bytes.get_otp(counter);
-//!     println!("The otp from hotp_bytes: {}", otp_from_bytes);
+//!     println!("The otp from hotp_bytes: {}", otp_from_bytes.as_string());
 //! }
 //! ```
 //!
@@ -44,7 +44,7 @@
 //!     let totp_sha1_str = TOTP::default_from_utf8(secret);
 //!     // Get an otp with the given counter and elapsed seconds
 //!     let otp_sha1 = totp_sha1_str.get_otp(elapsed_seconds);
-//!     println!("The otp from totp_sha1_str: {}", otp_sha1);
+//!     println!("The otp from totp_sha1_str: {}", otp_sha1.as_string());
 //!
 //!     // Alternatively get a TOTP instance with an '&[u8]' secret
 //!     // and different digest (Sha256 or Sha512)
@@ -59,7 +59,7 @@
 //!         elapsed_seconds,
 //!         0, // Start time at unix epoch
 //!     );
-//!     println!("The otp from totp_sha256_bytes: {}", otp_sha256);
+//!     println!("The otp from totp_sha256_bytes: {}", otp_sha256.as_string());
 //! }
 //! ```
 //!

tests/hotp.rs

@@ -8,21 +8,21 @@ static SECRET_BASE32: &str = "GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ";
 /// the Secret Key as a byte array
 fn run_rfc_test_bytes(count: u64) -> u32 {
     let hotp = HOTP::new(SECRET_BYTES, 6);
-    hotp.get_otp(count)
+    hotp.get_otp(count).as_u32()
 }
 
 /// Generic test method to get the HOTP code with
 /// the Secret Key as a string literal
 fn run_rfc_test_utf8(count: u64) -> u32 {
     let hotp = HOTP::default_from_utf8(SECRET_UTF8);
-    hotp.get_otp(count)
+    hotp.get_otp(count).as_u32()
 }
 
 /// Generic test method to get the HOTP code with
 /// the Secret Key as a base32-encoded string
 fn run_rfc_test_base32(count: u64) -> u32 {
     let hotp = HOTP::default_from_base32(SECRET_BASE32);
-    hotp.get_otp(count)
+    hotp.get_otp(count).as_u32()
 }
 
 // All RFC4226 Test Cases (All SHA1)

tests/totp.rs

@@ -25,7 +25,7 @@ static SECRET_BASE32_SHA512: &str = "GEZDGNBVGY3TQOJQGEZ\
 /// the SHA1 Secret Key as a byte array
 fn run_rfc_test_bytes(time: u64) -> u32 {
     let totp = TOTP::new(SECRET_BYTES_SHA1, MacDigest::SHA1, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 /// Generic test method to get the TOTP code with
@@ -37,14 +37,14 @@ fn run_rfc_test_bytes_with_digest(time: u64, digest: MacDigest) -> u32 {
         SECRET_BYTES_SHA512
     };
     let totp = TOTP::new(secret, digest, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 /// Generic test method to get the TOTP code with
 /// the SHA1 Secret Key as a string literal
 fn run_rfc_test_utf8(time: u64) -> u32 {
     let totp = TOTP::new_from_utf8(SECRET_UTF8_SHA1, MacDigest::SHA1, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 /// Generic test method to get the TOTP code with
@@ -56,14 +56,14 @@ fn run_rfc_test_utf8_with_digest(time: u64, digest: MacDigest) -> u32 {
         SECRET_UTF8_SHA512
     };
     let totp = TOTP::new_from_utf8(secret, digest, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 /// Generic test method to get the TOTP code with
 /// the SHA1 Secret Key as a base32-encoded string
 fn run_rfc_test_base32(time: u64) -> u32 {
     let totp = TOTP::new_from_base32(SECRET_BASE32_SHA1, MacDigest::SHA1, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 /// Generic test method to get the TOTP code with
@@ -75,7 +75,7 @@ fn run_rfc_test_base32_with_digest(time: u64, digest: MacDigest) -> u32 {
         SECRET_BASE32_SHA512
     };
     let totp = TOTP::new_from_base32(secret, digest, 8, 30);
-    totp.get_otp(time)
+    totp.get_otp(time).as_u32()
 }
 
 // All SHA-1 Tests for TOTP from rfc6238