From d95355e3d76c0c0022629e635f36a2dc325c0af2 Mon Sep 17 00:00:00 2001
From: Robin Krahl <robin.krahl@ireas.org>
Date: Tue, 5 Feb 2019 12:48:01 +0000
Subject: Revert "Store mutable reference to Device in PasswordSafe"

This reverts commit 13006c00dcbd570cf8347d89557834e320427377.
---
 tests/device.rs | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

(limited to 'tests')

diff --git a/tests/device.rs b/tests/device.rs
index 6a3683b..5c52024 100644
--- a/tests/device.rs
+++ b/tests/device.rs
@@ -156,7 +156,10 @@ fn change_user_pin(device: DeviceWrapper) {
     let device = device.authenticate_user(USER_NEW_PASSWORD).unwrap_err().0;
 
     let mut device = device;
-    assert_ok!((), device.change_user_pin(DEFAULT_USER_PIN, USER_NEW_PASSWORD));
+    assert_ok!(
+        (),
+        device.change_user_pin(DEFAULT_USER_PIN, USER_NEW_PASSWORD)
+    );
 
     let device = device.authenticate_user(DEFAULT_USER_PIN).unwrap_err().0;
     let device = device
@@ -179,7 +182,10 @@ fn change_user_pin(device: DeviceWrapper) {
 
 #[test_device]
 fn change_admin_pin(device: DeviceWrapper) {
-    let device = device.authenticate_admin(DEFAULT_ADMIN_PIN).unwrap().device();
+    let device = device
+        .authenticate_admin(DEFAULT_ADMIN_PIN)
+        .unwrap()
+        .device();
     let mut device = device.authenticate_admin(ADMIN_NEW_PASSWORD).unwrap_err().0;
 
     assert_ok!(
@@ -203,7 +209,10 @@ fn change_admin_pin(device: DeviceWrapper) {
         device.change_admin_pin(ADMIN_NEW_PASSWORD, DEFAULT_ADMIN_PIN)
     );
 
-    let device = device.authenticate_admin(DEFAULT_ADMIN_PIN).unwrap().device();
+    let device = device
+        .authenticate_admin(DEFAULT_ADMIN_PIN)
+        .unwrap()
+        .device();
     device.authenticate_admin(ADMIN_NEW_PASSWORD).unwrap_err();
 }
 
@@ -225,7 +234,10 @@ where
 #[test_device]
 fn unlock_user_pin(device: DeviceWrapper) {
     let mut device = device.authenticate_user(DEFAULT_USER_PIN).unwrap().device();
-    assert_ok!((), device.unlock_user_pin(DEFAULT_ADMIN_PIN, DEFAULT_USER_PIN));
+    assert_ok!(
+        (),
+        device.unlock_user_pin(DEFAULT_ADMIN_PIN, DEFAULT_USER_PIN)
+    );
     assert_cmd_err!(
         CommandError::WrongPassword,
         device.unlock_user_pin(DEFAULT_USER_PIN, DEFAULT_USER_PIN)
@@ -236,21 +248,26 @@ fn unlock_user_pin(device: DeviceWrapper) {
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
-    let mut device = require_failed_user_login(device, DEFAULT_USER_PIN, CommandError::WrongPassword);
+    let mut device =
+        require_failed_user_login(device, DEFAULT_USER_PIN, CommandError::WrongPassword);
 
     // unblock with current PIN
     assert_cmd_err!(
         CommandError::WrongPassword,
         device.unlock_user_pin(DEFAULT_USER_PIN, DEFAULT_USER_PIN)
     );
-    assert_ok!((), device.unlock_user_pin(DEFAULT_ADMIN_PIN, DEFAULT_USER_PIN));
+    assert_ok!(
+        (),
+        device.unlock_user_pin(DEFAULT_ADMIN_PIN, DEFAULT_USER_PIN)
+    );
     let device = device.authenticate_user(DEFAULT_USER_PIN).unwrap().device();
 
     // block user PIN
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
     let device = require_failed_user_login(device, &wrong_password, CommandError::WrongPassword);
-    let mut device = require_failed_user_login(device, DEFAULT_USER_PIN, CommandError::WrongPassword);
+    let mut device =
+        require_failed_user_login(device, DEFAULT_USER_PIN, CommandError::WrongPassword);
 
     // unblock with new PIN
     assert_cmd_err!(
@@ -307,7 +324,10 @@ fn factory_reset(device: DeviceWrapper) {
     );
     assert_ok!((), device.factory_reset(ADMIN_NEW_PASSWORD));
 
-    let device = device.authenticate_admin(DEFAULT_ADMIN_PIN).unwrap().device();
+    let device = device
+        .authenticate_admin(DEFAULT_ADMIN_PIN)
+        .unwrap()
+        .device();
 
     let user = unwrap_ok!(device.authenticate_user(DEFAULT_USER_PIN));
     assert_cmd_err!(CommandError::SlotNotProgrammed, user.get_totp_slot_name(1));
@@ -335,7 +355,10 @@ fn build_aes_key(device: DeviceWrapper) {
     );
     assert_ok!((), device.build_aes_key(DEFAULT_ADMIN_PIN));
 
-    let mut device = device.authenticate_admin(DEFAULT_ADMIN_PIN).unwrap().device();
+    let mut device = device
+        .authenticate_admin(DEFAULT_ADMIN_PIN)
+        .unwrap()
+        .device();
 
     let pws = unwrap_ok!(device.get_password_safe(DEFAULT_USER_PIN));
     assert_utf8_err_or_ne("test", pws.get_slot_name(0));
-- 
cgit v1.2.3