Addressed reviewer comments.

Signed-off-by: Holger Rapp <[email protected]>
EVerest · Dec 15, 2023 · 0f27451 · 0f27451
1 parent 2e8c408
commit 0f27451
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/zvt/BUILD.bazel b/zvt/BUILD.bazel
@@ -18,4 +18,5 @@ rust_test(
     data = glob(["data/*.blob"]),
     edition = "2021",
     proc_macro_deps = all_crate_deps(proc_macro = True),
+    deps = all_crate_deps(),
 )
diff --git a/zvt/src/packets.rs b/zvt/src/packets.rs
@@ -482,6 +482,7 @@ pub mod tests {
                 sak: Some(0x20),
                 subs: vec![tlv::Subs {
                     application_id: Some("a0000000041010".to_string()),
+                    card_type: None,
                 }],
             }),
             ..StatusInformation::default()
@@ -630,11 +631,11 @@ pub mod tests {
                 subs: Vec::new(),
                 subs_on_card: Some(tlv::SubsOnCard {
                     subs: vec![
-                        tlv::SubOnCard {
+                        tlv::Subs {
                             application_id: Some("a0000003591010028001".to_string()),
                             card_type: Some("0005".to_string()),
                         },
-                        tlv::SubOnCard {
+                        tlv::Subs {
                             application_id: Some("a0000000043060".to_string()),
                             card_type: Some("002e".to_string()),
                         },

diff --git a/zvt/src/packets/tlv.rs b/zvt/src/packets/tlv.rs
@@ -3,12 +3,6 @@ use chrono::NaiveDateTime;
 
 #[derive(Debug, Default, PartialEq, Zvt)]
 pub struct Subs {
-    #[zvt_bmp(number = 0x43, length = length::Tlv, encoding = encoding::Hex)]
-    pub application_id: Option<String>,
-}
-
-#[derive(Debug, Default, PartialEq, Zvt)]
-pub struct SubOnCard {
     #[zvt_tlv(tag = 0x41, encoding = encoding::Hex)]
     pub card_type: Option<String>,
 
@@ -19,7 +13,7 @@ pub struct SubOnCard {
 #[derive(Debug, Default, PartialEq, Zvt)]
 pub struct SubsOnCard {
     #[zvt_tlv(tag = 0x60)]
-    pub subs: Vec<SubOnCard>,
+    pub subs: Vec<Subs>,
 }
 
 #[derive(Debug, Default, PartialEq, Zvt)]
@@ -65,16 +59,16 @@ pub struct StatusEnquiry {
 
 #[derive(Debug, PartialEq, Zvt)]
 pub struct DeviceInformation {
-    #[zvt_bmp(number = 0x1f40, length = length::Tlv)]
+    #[zvt_tlv(tag = 0x1f40)]
     pub device_name: Option<String>,
 
-    #[zvt_bmp(number = 0x1f41, length = length::Tlv)]
+    #[zvt_tlv(tag = 0x1f41)]
     pub software_version: Option<String>,
 
-    #[zvt_bmp(number = 0x1f42, length = length::Tlv, encoding = encoding::Bcd)]
+    #[zvt_tlv(tag = 0x1f42, encoding = encoding::Bcd)]
     pub serial_number: Option<usize>,
 
-    #[zvt_bmp(number = 0x1f43, length = length::Tlv)]
+    #[zvt_tlv(tag = 0x1f43)]
     pub device_state: Option<u8>,
 }
 
@@ -133,7 +127,7 @@ pub struct ReadCard {
 
 #[derive(Debug, PartialEq, Zvt)]
 pub struct ZvtString {
-    #[zvt_bmp(number = 0x07, length=length::Tlv)]
+    #[zvt_tlv(tag = 0x07)]
     pub line: String,
 }
 

diff --git a/zvt/tests/derive.rs b/zvt/tests/derive.rs
@@ -194,7 +194,7 @@ fn test_nested() {
     #[derive(Zvt, PartialEq, Debug)]
     struct Outer {
         a: u16,
-        #[zvt_bmp(number = 0x12, length = length::Tlv)]
+        #[zvt_tlv(tag = 0x12)]
         b: Option<Inner>,
     }
 

diff --git a/zvt_cli/src/main.rs b/zvt_cli/src/main.rs
@@ -143,8 +143,8 @@ struct ReservationArgs {
     #[argh(option, default = "64")]
     payment_type: u8,
 
-    #[argh(option)]
     /// track 2 data to identify past read card.
+    #[argh(option)]
     track_2_data: Option<String>,
 
     /// bmp_prefix. If this is set, bmp_data must be set too.