Restructure trait implementations for wrappers

For DeviceWrapper, the traits GenerateOtp and Device are now directly
implemented instead of complicated template implementations.  For User
and Admin, the wrapper implementations are replaced with an
implementation of the Deref trait for easier access.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/tests/pro.rs b/src/tests/pro.rs
index e52c287..5415ff9 100644
--- a/src/tests/pro.rs
+++ b/src/tests/pro.rs
@@ -1,4 +1,5 @@
 use std::ffi::CStr;
+use std::ops::Deref;
 use {Admin, Authenticate, CommandError, CommandStatus, Config, ConfigureOtp, Device, GenerateOtp,
      OtpMode, OtpSlotData, Pro};
 
@@ -101,7 +102,7 @@ fn hotp() {
     assert_eq!(CommandStatus::Success, admin.write_config(config));
 
     configure_hotp(&admin);
-    check_hotp_codes(&admin);
+    check_hotp_codes(admin.deref());
 
     configure_hotp(&admin);
     check_hotp_codes(&admin.device());
@@ -203,7 +204,7 @@ fn totp() {
     assert_eq!(CommandStatus::Success, admin.write_config(config));
 
     configure_totp(&admin);
-    check_totp_codes(&admin);
+    check_totp_codes(admin.deref());
 
     configure_totp(&admin);
     check_totp_codes(&admin.device());