From a18066a1a10792ddbd57527ad58f75fc84fafad2 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Wed, 17 Jul 2019 20:53:58 -0700 Subject: Use nitrokey::DEFAULT_{ADMIN,USER}_PIN constants Since version 0.4.0, nitrokey provides the default admin and user PIN as constants. This patch removes the constants from nitrocli and uses nitrokey's constant instead. --- nitrocli/src/tests/mod.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'nitrocli/src/tests/mod.rs') diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs index c2b51c2..e8af624 100644 --- a/nitrocli/src/tests/mod.rs +++ b/nitrocli/src/tests/mod.rs @@ -22,11 +22,6 @@ use std::fmt; use nitrokey_test::test as test_device; -// TODO: Those defines should potentially be taken from the `nitrokey` -// crate, once exported. -const NITROKEY_DEFAULT_ADMIN_PIN: &str = "12345678"; -const NITROKEY_DEFAULT_USER_PIN: &str = "123456"; - mod config; mod encrypted; mod hidden; @@ -94,8 +89,8 @@ impl Nitrocli { pub fn new() -> Self { Self { model: None, - admin_pin: Some(NITROKEY_DEFAULT_ADMIN_PIN.into()), - user_pin: Some(NITROKEY_DEFAULT_USER_PIN.into()), + admin_pin: Some(nitrokey::DEFAULT_ADMIN_PIN.into()), + user_pin: Some(nitrokey::DEFAULT_USER_PIN.into()), new_admin_pin: None, new_user_pin: None, password: None, @@ -108,8 +103,8 @@ impl Nitrocli { { let result = Self { model: Some(device.get_model()), - admin_pin: Some(NITROKEY_DEFAULT_ADMIN_PIN.into()), - user_pin: Some(NITROKEY_DEFAULT_USER_PIN.into()), + admin_pin: Some(nitrokey::DEFAULT_ADMIN_PIN.into()), + user_pin: Some(nitrokey::DEFAULT_USER_PIN.into()), new_admin_pin: None, new_user_pin: None, password: Some("1234567".into()), -- cgit v1.2.1