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.

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

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"

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)

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(())

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(())

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(())
 }

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(())