Move {Pro, Storage}::connect into Manager

As part of the connection refactoring, this patch moves the connect
methods of the Pro and Storage structs into the Manager struct.  To
maintain compatibility with nitrokey-test, the old methods are not
removed but marked as deprecated.

1 files changed, 10 insertions, 15 deletions

diff --git a/src/device.rs b/src/device.rs
index f28558d..758691d 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -9,7 +9,7 @@ use nitrokey_sys;
 
 use crate::auth::Authenticate;
 use crate::config::{Config, RawConfig};
-use crate::error::{CommunicationError, Error};
+use crate::error::Error;
 use crate::otp::GenerateOtp;
 use crate::pws::GetPasswordSafe;
 use crate::util::{
@@ -755,16 +755,12 @@ impl Pro {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
+    #[deprecated(since = "0.4.0", note = "use `nitrokey::Manager::connect_pro` instead")]
     pub fn connect() -> Result<Pro, Error> {
-        // TODO: maybe Option instead of Result?
-        if connect_enum(Model::Pro) {
-            Ok(Pro::new())
-        } else {
-            Err(CommunicationError::NotConnected.into())
-        }
+        crate::take()?.connect_pro().map_err(Into::into)
     }
 
-    fn new() -> Pro {
+    pub(crate) fn new() -> Pro {
         Pro {
             marker: marker::PhantomData,
         }
@@ -808,16 +804,15 @@ impl Storage {
     /// ```
     ///
     /// [`NotConnected`]: enum.CommunicationError.html#variant.NotConnected
+    #[deprecated(
+        since = "0.4.0",
+        note = "use `nitrokey::Manager::connect_storage` instead"
+    )]
     pub fn connect() -> Result<Storage, Error> {
-        // TODO: maybe Option instead of Result?
-        if connect_enum(Model::Storage) {
-            Ok(Storage::new())
-        } else {
-            Err(CommunicationError::NotConnected.into())
-        }
+        crate::take()?.connect_storage().map_err(Into::into)
     }
 
-    fn new() -> Storage {
+    pub(crate) fn new() -> Storage {
         Storage {
             marker: marker::PhantomData,
         }