Remove hack required for having device tests in different modules

With nitrokey-test up to version 0.2.0 we required a work around to make
device tests work across different modules.
With this patch we bump the consumed version of the crate to 0.2.1, as
part which the underlying problem got fixed. Hence, with this change we
remove this hack as it is no longer needed.

3 files changed, 14 insertions, 13 deletions

diff --git a/nitrocli/Cargo.lock b/nitrocli/Cargo.lock
index 8477b6a..d2362af 100644
--- a/nitrocli/Cargo.lock
+++ b/nitrocli/Cargo.lock
@@ -78,7 +78,8 @@ dependencies = [
  "base32 0.4.0",
  "libc 0.2.66",
  "nitrokey 0.4.0-alpha.0",
- "nitrokey-test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nitrokey-test 0.2.1 (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.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -101,7 +102,7 @@ dependencies = [
 
 [[package]]
 name = "nitrokey-test"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -110,6 +111,11 @@ dependencies = [
 ]
 
 [[package]]
+name = "nitrokey-test-state"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
 name = "proc-macro2"
 version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -230,7 +236,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
-"checksum nitrokey-test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54999e04037babf905431614d4bef874c4b80d496e361c7939920e2506faba5f"
+"checksum nitrokey-test 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f2195b25114e38da93d24169b074e7d1007238a0e33916e01b353099c09df379"
+"checksum nitrokey-test-state 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a59b732ed6d5212424ed31ec9649f05652bcbc38f45f2292b27a6044e7098803"
 "checksum proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "38fddd23d98b2144d197c0eca5705632d4fe2667d14a6be5df8934f8d74f1978"
 "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml
index c2a061d..f8db130 100644
--- a/nitrocli/Cargo.toml
+++ b/nitrocli/Cargo.toml
@@ -56,7 +56,10 @@ version = "0.2"
 version = "0.4.0-alpha.0"
 
 [dev-dependencies.nitrokey-test]
-version = "0.2"
+version = "0.2.1"
+
+[dev-dependencies.nitrokey-test-state]
+version = "0.1"
 
 [dev-dependencies.regex]
 version = "1"
diff --git a/nitrocli/src/tests/mod.rs b/nitrocli/src/tests/mod.rs
index 0e5d8bc..c2b51c2 100644
--- a/nitrocli/src/tests/mod.rs
+++ b/nitrocli/src/tests/mod.rs
@@ -27,15 +27,6 @@ use nitrokey_test::test as test_device;
 const NITROKEY_DEFAULT_ADMIN_PIN: &str = "12345678";
 const NITROKEY_DEFAULT_USER_PIN: &str = "123456";
 
-// TODO: This is a hack to make the nitrokey-test crate work across
-//       module boundaries. Upon first use of the nitrokey_test::test
-//       macro a new function, __nitrokey_mutex, will be emitted, but it
-//       is not visible in a different module. To work around that we
-//       trigger the macro here first and then `use super::*` from all
-//       of the submodules.
-#[test_device]
-fn dummy() {}
-
 mod config;
 mod encrypted;
 mod hidden;