Bump nitrokey dependency to version 0.5.1

This change updates the version of the nitrokey crate that we use to
0.5.1. As part of that, it replaces occurrences of Storage::get_status
with Storage::get_storage_status as the method has been renamed.

8 files changed, 19 insertions, 18 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c1ea18..9eeb9f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Unreleased
   - Removed `argparse` dependency
 - Removed vendored dependencies and moved source code into repository
   root
+- Bumped `nitrokey` dependency to `0.5.1`
 
 
 0.3.1
diff --git a/Cargo.lock b/Cargo.lock
index 9411478..dac3e54 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,7 +77,7 @@ version = "0.3.1"
 dependencies = [
  "base32 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "nitrokey 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nitrokey 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "nitrokey-test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "nitrokey-test-state 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -86,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "nitrokey"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -277,7 +277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum nitrokey 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a5f19c16e1530850b171e98ad1c95fe0af897916eb308e19fbfd3ee2dcda0abe"
+"checksum nitrokey 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dcec8a996394226fd4d441bf41a0e9f0cbd2a540ff1dcf16e5d4d813bbea39cb"
 "checksum nitrokey-sys 3.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71c6052aeb37309317d25c8fec2801f271b96c5a15656f2573d8e78ba4124c49"
 "checksum nitrokey-test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f3da0c2cedaa512f79fbc3ed45143a52c76c5edcca88d0823b967ff11d05fe37"
 "checksum nitrokey-test-state 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a59b732ed6d5212424ed31ec9649f05652bcbc38f45f2292b27a6044e7098803"
diff --git a/Cargo.toml b/Cargo.toml
index 972ebb0..68dbeaa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ version = "0.4.0"
 version = "0.2"
 
 [dependencies.nitrokey]
-version = "0.4.0"
+version = "0.5.1"
 
 [dependencies.structopt]
 version = "0.3.7"
diff --git a/src/commands.rs b/src/commands.rs
index 537a2cf..cc57786 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -356,7 +356,7 @@ fn print_status(
 
   if let nitrokey::DeviceWrapper::Storage(device) = device {
     let status = device
-      .get_status()
+      .get_storage_status()
       .map_err(|err| get_error("Getting Storage status failed", err))?;
 
     print_storage_status(ctx, &status)
diff --git a/src/tests/encrypted.rs b/src/tests/encrypted.rs
index 75b84c3..aed2662 100644
--- a/src/tests/encrypted.rs
+++ b/src/tests/encrypted.rs
@@ -77,8 +77,8 @@ fn encrypted_open_close(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(device.get_status()?.encrypted_volume.active);
-    assert!(!device.get_status()?.hidden_volume.active);
+    assert!(device.get_storage_status()?.encrypted_volume.active);
+    assert!(!device.get_storage_status()?.hidden_volume.active);
   }
 
   let out = ncli.handle(&["encrypted", "close"])?;
@@ -87,8 +87,8 @@ fn encrypted_open_close(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(!device.get_status()?.encrypted_volume.active);
-    assert!(!device.get_status()?.hidden_volume.active);
+    assert!(!device.get_storage_status()?.encrypted_volume.active);
+    assert!(!device.get_storage_status()?.hidden_volume.active);
   }
 
   Ok(())
diff --git a/src/tests/hidden.rs b/src/tests/hidden.rs
index 28a5d23..eabcfd4 100644
--- a/src/tests/hidden.rs
+++ b/src/tests/hidden.rs
@@ -31,8 +31,8 @@ fn hidden_create_open_close(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(!device.get_status()?.encrypted_volume.active);
-    assert!(device.get_status()?.hidden_volume.active);
+    assert!(!device.get_storage_status()?.encrypted_volume.active);
+    assert!(device.get_storage_status()?.hidden_volume.active);
   }
 
   let out = ncli.handle(&["hidden", "close"])?;
@@ -41,8 +41,8 @@ fn hidden_create_open_close(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(!device.get_status()?.encrypted_volume.active);
-    assert!(!device.get_status()?.hidden_volume.active);
+    assert!(!device.get_storage_status()?.encrypted_volume.active);
+    assert!(!device.get_storage_status()?.hidden_volume.active);
   }
 
   Ok(())
diff --git a/src/tests/lock.rs b/src/tests/lock.rs
index 5140152..b29f394 100644
--- a/src/tests/lock.rs
+++ b/src/tests/lock.rs
@@ -38,7 +38,7 @@ fn lock_storage(model: nitrokey::Model) -> crate::Result<()> {
 
   let mut manager = nitrokey::force_take()?;
   let device = manager.connect_storage()?;
-  assert!(!device.get_status()?.encrypted_volume.active);
+  assert!(!device.get_storage_status()?.encrypted_volume.active);
 
   Ok(())
 }
diff --git a/src/tests/unencrypted.rs b/src/tests/unencrypted.rs
index 547dcaf..ceeb17c 100644
--- a/src/tests/unencrypted.rs
+++ b/src/tests/unencrypted.rs
@@ -28,8 +28,8 @@ fn unencrypted_set_read_write(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(device.get_status()?.unencrypted_volume.active);
-    assert!(!device.get_status()?.unencrypted_volume.read_only);
+    assert!(device.get_storage_status()?.unencrypted_volume.active);
+    assert!(!device.get_storage_status()?.unencrypted_volume.read_only);
   }
 
   let out = ncli.handle(&["unencrypted", "set", "read-only"])?;
@@ -38,8 +38,8 @@ fn unencrypted_set_read_write(model: nitrokey::Model) -> crate::Result<()> {
   {
     let mut manager = nitrokey::force_take()?;
     let device = manager.connect_storage()?;
-    assert!(device.get_status()?.unencrypted_volume.active);
-    assert!(device.get_status()?.unencrypted_volume.read_only);
+    assert!(device.get_storage_status()?.unencrypted_volume.active);
+    assert!(device.get_storage_status()?.unencrypted_volume.read_only);
   }
 
   Ok(())