Add get_firmware_version method

This patch combines the get_{major,minor}_firmware_version methods into
the new get_firmware_version method that returns a FirmwareVersion
struct.  Currently, this requires casting from i32 to u8.  But this will
be fixed with the next libnitrokey version as we change the return types
for the firmware getters.

1 files changed, 3 insertions, 4 deletions

diff --git a/tests/device.rs b/tests/device.rs
index 7ab4d66..d80f011 100644
--- a/tests/device.rs
+++ b/tests/device.rs
@@ -95,10 +95,9 @@ fn get_serial_number(device: DeviceWrapper) {
 }
 #[test_device]
 fn get_firmware_version(device: Pro) {
-    assert_ok!(0, device.get_major_firmware_version());
-    let minor = device.get_minor_firmware_version();
-    assert!(minor.is_ok());
-    assert!(minor.unwrap() > 0);
+    let version = device.get_firmware_version().unwrap();
+    assert_eq!(0, version.major);
+    assert!(version.minor > 0);
 }
 
 fn admin_retry<T: Authenticate + Device>(device: T, suffix: &str, count: u8) -> T {