Skip to content

Commit

Permalink
Merge pull request #16 from dodomorandi/float-in-dgc-cert-container
Browse files Browse the repository at this point in the history 
Allow floating points in DgcCertContainer
  • Loading branch information
@lmammino
lmammino authored Nov 24, 2021
2 parents 77d5e83 + 68ecdc1 commit 4501ecd
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 30 deletions.
11 changes: 9 additions & 2 deletions src/dgc_container.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,22 @@ pub struct DgcCertContainer {
pub issuer: String,
#[serde(alias = "6")]
#[serde(rename(serialize = "6"))]
pub issued_at: u64,
pub issued_at: IntegerOrFloat,
#[serde(alias = "4")]
#[serde(rename(serialize = "4"))]
pub expiration_time: u64,
pub expiration_time: IntegerOrFloat,
#[serde(alias = "-260")]
#[serde(rename(serialize = "-260"))]
pub certs: HashMap<usize, DgcCert>,
}

#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[serde(untagged)]
pub enum IntegerOrFloat {
Float(f64),
Integer(u64),
}

impl DgcCertContainer {
pub fn expand_values(&mut self) {
self.certs.iter_mut().for_each(|(_, t)| t.expand_values());
Expand Down
56 changes: 28 additions & 28 deletions tests/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,43 +82,43 @@ use std::path::PathBuf;
// #[case::de_2dcode_raw_2_json("DE/2DCode/raw/2.json")] // SKIPPED. See #1
// #[case::de_2dcode_raw_3_json("DE/2DCode/raw/3.json")] // SKIPPED. See #1
// #[case::de_2dcode_raw_4_json("DE/2DCode/raw/4.json")] // SKIPPED. See #1
// #[case::dk_2dcode_raw_1_json("DK/2DCode/raw/1.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_10_json("DK/2DCode/raw/10.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_11_json("DK/2DCode/raw/11.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_12_json("DK/2DCode/raw/12.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_2_json("DK/2DCode/raw/2.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_3_json("DK/2DCode/raw/3.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_4_json("DK/2DCode/raw/4.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_5_json("DK/2DCode/raw/5.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_7_json("DK/2DCode/raw/7.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::dk_2dcode_raw_8_json("DK/2DCode/raw/8.json")] // SKIPPED. `issued_at` is a float (see #3)
#[case::dk_2dcode_raw_1_json("DK/2DCode/raw/1.json")]
#[case::dk_2dcode_raw_10_json("DK/2DCode/raw/10.json")]
#[case::dk_2dcode_raw_11_json("DK/2DCode/raw/11.json")]
#[case::dk_2dcode_raw_12_json("DK/2DCode/raw/12.json")]
#[case::dk_2dcode_raw_2_json("DK/2DCode/raw/2.json")]
#[case::dk_2dcode_raw_3_json("DK/2DCode/raw/3.json")]
#[case::dk_2dcode_raw_4_json("DK/2DCode/raw/4.json")]
#[case::dk_2dcode_raw_5_json("DK/2DCode/raw/5.json")]
#[case::dk_2dcode_raw_7_json("DK/2DCode/raw/7.json")]
#[case::dk_2dcode_raw_8_json("DK/2DCode/raw/8.json")]
// #[case::es_2dcode_raw_1001_json("ES/2DCode/raw/1001.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1002_json("ES/2DCode/raw/1002.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1003_json("ES/2DCode/raw/1003.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_101_json("ES/2DCode/raw/101.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_102_json("ES/2DCode/raw/102.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_103_json("ES/2DCode/raw/103.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1101_json("ES/2DCode/raw/1101.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1102_json("ES/2DCode/raw/1102.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1103_json("ES/2DCode/raw/1103.json")] // SKIPPED. `issued_at` is a float (see #3)
#[case::es_2dcode_raw_101_json("ES/2DCode/raw/101.json")]
#[case::es_2dcode_raw_102_json("ES/2DCode/raw/102.json")]
#[case::es_2dcode_raw_103_json("ES/2DCode/raw/103.json")]
#[case::es_2dcode_raw_1101_json("ES/2DCode/raw/1101.json")]
#[case::es_2dcode_raw_1102_json("ES/2DCode/raw/1102.json")]
#[case::es_2dcode_raw_1103_json("ES/2DCode/raw/1103.json")]
// #[case::es_2dcode_raw_1501_json("ES/2DCode/raw/1501.json")] // SKIPPED. Invalid COSE (missing tag)
// #[case::es_2dcode_raw_1502_json("ES/2DCode/raw/1502.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_1503_json("ES/2DCode/raw/1503.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_201_json("ES/2DCode/raw/201.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_202_json("ES/2DCode/raw/202.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_203_json("ES/2DCode/raw/203.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_2101_json("ES/2DCode/raw/2101.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_2102_json("ES/2DCode/raw/2102.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_2103_json("ES/2DCode/raw/2103.json")] // SKIPPED. `issued_at` is a float (see #3)
#[case::es_2dcode_raw_201_json("ES/2DCode/raw/201.json")]
#[case::es_2dcode_raw_202_json("ES/2DCode/raw/202.json")]
#[case::es_2dcode_raw_203_json("ES/2DCode/raw/203.json")]
#[case::es_2dcode_raw_2101_json("ES/2DCode/raw/2101.json")]
#[case::es_2dcode_raw_2102_json("ES/2DCode/raw/2102.json")]
#[case::es_2dcode_raw_2103_json("ES/2DCode/raw/2103.json")]
// #[case::es_2dcode_raw_401_json("ES/2DCode/raw/401.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_402_json("ES/2DCode/raw/402.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_403_json("ES/2DCode/raw/403.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_501_json("ES/2DCode/raw/501.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_502_json("ES/2DCode/raw/502.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_503_json("ES/2DCode/raw/503.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_701_json("ES/2DCode/raw/701.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_702_json("ES/2DCode/raw/702.json")] // SKIPPED. `issued_at` is a float (see #3)
// #[case::es_2dcode_raw_703_json("ES/2DCode/raw/703.json")] // SKIPPED. `issued_at` is a float (see #3)
#[case::es_2dcode_raw_501_json("ES/2DCode/raw/501.json")]
#[case::es_2dcode_raw_502_json("ES/2DCode/raw/502.json")]
#[case::es_2dcode_raw_503_json("ES/2DCode/raw/503.json")]
#[case::es_2dcode_raw_701_json("ES/2DCode/raw/701.json")]
#[case::es_2dcode_raw_702_json("ES/2DCode/raw/702.json")]
#[case::es_2dcode_raw_703_json("ES/2DCode/raw/703.json")]
#[case::fi_2dcode_raw_1_json("FI/2DCode/raw/1.json")]
#[case::fi_2dcode_raw_10_json("FI/2DCode/raw/10.json")]
#[case::fi_2dcode_raw_2_json("FI/2DCode/raw/2.json")]
Expand Down

0 comments on commit 4501ecd

Please sign in to comment.