Removed cruft

Author: rozbb

src/params.rs

@@ -1,11 +1,8 @@
 use crate::passport_info::{PersonalInfo, PersonalInfoVar};
 
 use zkcreds::proof_data_structures::{
-    ForestProof as ZeronymForestProof, ForestProvingKey as ZeronymForestPk,
-    ForestVerifyingKey as ZeronymForestVk, PredProof as ZeronymPredProof,
-    PredProvingKey as ZeronymPredPk, PredVerifyingKey as ZeronymPredVk,
-    TreeProof as ZeronymTreeProof, TreeProvingKey as ZeronymTreePk,
-    TreeVerifyingKey as ZeronymTreeVk,
+    PredProof as ZeronymPredProof, PredProvingKey as ZeronymPredPk,
+    PredVerifyingKey as ZeronymPredVk,
 };
 
 use ark_bls12_381::Bls12_381;
@@ -84,12 +81,9 @@ pub(crate) type PassportComSchemeG =
     zkcreds::compressed_pedersen::constraints::CommGadget<EdwardsParameters, FqVar, Window9x128>;
 
 pub(crate) type ComTree = zkcreds::com_tree::ComTree<Fr, H, PassportComScheme>;
-pub(crate) type ComForest = zkcreds::com_forest::ComForest<Fr, H, PassportComScheme>;
-pub(crate) type ComTreePath = zkcreds::com_tree::ComTreePath<Fr, H, PassportComScheme>;
-pub(crate) type ComForestRoots = zkcreds::com_forest::ComForestRoots<Fr, H>;
 
 /// Type aliases for Groth16 stuff
-pub(crate) type PredProvingKey = ZeronymPredPk<
+pub(crate) type PredProof = ZeronymPredProof<
     Bls12_381,
     PersonalInfo,
     PersonalInfoVar,
@@ -98,7 +92,7 @@ pub(crate) type PredProvingKey = ZeronymPredPk<
     H,
     HG,
 >;
-pub(crate) type PredVerifyingKey = ZeronymPredVk<
+pub(crate) type PredProvingKey = ZeronymPredPk<
     Bls12_381,
     PersonalInfo,
     PersonalInfoVar,
@@ -107,15 +101,7 @@ pub(crate) type PredVerifyingKey = ZeronymPredVk<
     H,
     HG,
 >;
-pub(crate) type TreeProvingKey =
-    ZeronymTreePk<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
-pub(crate) type TreeVerifyingKey =
-    ZeronymTreeVk<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
-pub(crate) type ForestProvingKey =
-    ZeronymForestPk<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
-pub(crate) type ForestVerifyingKey =
-    ZeronymForestVk<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
-pub(crate) type PredProof = ZeronymPredProof<
+pub(crate) type PredVerifyingKey = ZeronymPredVk<
     Bls12_381,
     PersonalInfo,
     PersonalInfoVar,
@@ -124,10 +110,6 @@ pub(crate) type PredProof = ZeronymPredProof<
     H,
     HG,
 >;
-pub(crate) type TreeProof =
-    ZeronymTreeProof<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
-pub(crate) type ForestProof =
-    ZeronymForestProof<Bls12_381, PersonalInfo, PassportComScheme, PassportComSchemeG, H, HG>;
 
 // Set params
 lazy_static! {

src/passport_dump.rs

@@ -16,11 +16,11 @@ pub struct PassportDump {
     #[serde(deserialize_with = "bytes_from_b64")]
     pub(crate) sig: Vec<u8>,
     #[serde(deserialize_with = "bytes_from_b64")]
-    pub(crate) cert: Vec<u8>,
+    pub(crate) _cert: Vec<u8>,
     #[serde(rename = "digest-alg")]
-    pub(crate) digest_alg: String,
+    pub(crate) _digest_alg: String,
     #[serde(rename = "sig-alg")]
-    pub(crate) sig_alg: String,
+    pub(crate) _sig_alg: String,
 }
 
 impl PassportDump {

src/passport_info.rs

@@ -111,29 +111,6 @@ fn date_to_u32(date: &[u8], not_after: u32) -> u32 {
 }
 
 impl PersonalInfo {
-    /// Constructs a new `PersonalInfo`, sampling a random nonce for commitment
-    pub(crate) fn new<R: Rng>(
-        rng: &mut R,
-        nationality: [u8; STATE_ID_LEN],
-        name: [u8; NAME_LEN],
-        dob: u32,
-        passport_expiry: u32,
-        biometrics: Biometrics,
-    ) -> PersonalInfo {
-        let nonce = ComNonce::<PassportComScheme>::rand(rng);
-        let seed = Fr::rand(rng);
-
-        PersonalInfo {
-            nonce,
-            seed,
-            nationality,
-            name,
-            dob,
-            passport_expiry,
-            biometrics,
-        }
-    }
-
     /// Converts the given passport dump into a structured attribute struct. Requires `today` as an
     /// integer whose base-10 representation is of the form YYYYMMDD. `max_valid_years` is the
     /// longest that a passport can be valid, in years.
@@ -169,10 +146,6 @@ impl PersonalInfo {
 
         info
     }
-
-    pub fn biometrics_hash(&self) -> [u8; HASH_LEN] {
-        self.biometrics.hash()
-    }
 }
 
 impl Attrs<Fr, PassportComScheme> for PersonalInfo {

src/sig_verif.rs

@@ -1,6 +1,4 @@
-use crate::passport_dump::PassportDump;
 use rsa::{padding::PaddingScheme, pkcs8::FromPublicKey, Hash, PublicKey, RsaPublicKey};
-use x509_parser::parse_x509_certificate;
 
 // A PKCS#8 encoding of the US State Department's passport signing pubkey. This was a pain to
 // extract. See the below link for instructions
@@ -23,12 +21,6 @@ pub fn load_usa_pubkey() -> IssuerPubkey {
     IssuerPubkey(pubkey)
 }
 
-pub fn load_pubkey_from_dump(dump: &PassportDump) -> IssuerPubkey {
-    let cert = (parse_x509_certificate(&dump.cert).unwrap()).1;
-    let pubkey = RsaPublicKey::from_public_key_der(cert.public_key().raw).unwrap();
-    IssuerPubkey(pubkey)
-}
-
 impl IssuerPubkey {
     #[must_use]
     pub fn verify(&self, sig: &[u8], hash: &[u8]) -> bool {