Always store serial numbers as integers

This patch consistently uses u32 integers to store and return the serial
number of a Nitrokey device.  This makes it easier to convert and
compare the serial number, as it is a unique representation and as
formatting an integer cannot fail.  For more details, see this RFC:
	https://lists.sr.ht/~ireas/nitrokey-rs-dev/%3C20200126074816.GA1314%40ireas.org%3E

1 files changed, 3 insertions, 10 deletions

diff --git a/tests/device.rs b/tests/device.rs
index a88c956..2989941 100644
--- a/tests/device.rs
+++ b/tests/device.rs
@@ -47,8 +47,7 @@ fn list_devices(_device: DeviceWrapper) {
                 nitrokey::Model::Pro => {
                     assert!(device.serial_number.is_some());
                     let serial_number = device.serial_number.unwrap();
-                    assert!(!serial_number.is_empty());
-                    assert_valid_serial_number(&serial_number);
+                    assert!(serial_number != 0);
                 }
                 nitrokey::Model::Storage => {
                     assert_eq!(None, device.serial_number);
@@ -157,20 +156,14 @@ fn disconnect(device: DeviceWrapper) {
 fn get_status(device: DeviceWrapper) {
     let status = unwrap_ok!(device.get_status());
     assert_ok!(status.firmware_version, device.get_firmware_version());
-    let serial_number = format!("{:08x}", status.serial_number);
-    assert_ok!(serial_number, device.get_serial_number());
+    assert_ok!(status.serial_number, device.get_serial_number());
     assert_ok!(status.config, device.get_config());
 }
 
-fn assert_valid_serial_number(serial_number: &str) {
-    assert!(serial_number.is_ascii());
-    assert!(serial_number.chars().all(|c| c.is_ascii_hexdigit()));
-}
-
 #[test_device]
 fn get_serial_number(device: DeviceWrapper) {
     let serial_number = unwrap_ok!(device.get_serial_number());
-    assert_valid_serial_number(&serial_number);
+    assert!(serial_number != 0);
 }
 
 #[test_device]