From 167b015ffff982293544f8ee789d87ee1358cfb4 Mon Sep 17 00:00:00 2001
From: Dastan-glitch <Dastan.ManDan@gmail.com>
Date: Sun, 16 Jan 2022 18:40:22 -0500
Subject: [PATCH] crypto: minor cleanup

---
 src/crypto/loader.rs |  6 +++---
 src/crypto/mod.rs    |  1 +
 src/crypto/proof.rs  | 10 +++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/crypto/loader.rs b/src/crypto/loader.rs
index 19af40869..fb33bcba2 100644
--- a/src/crypto/loader.rs
+++ b/src/crypto/loader.rs
@@ -2,11 +2,11 @@ use std::{fs::*, path::PathBuf, time::Instant};
 
 use crate::{
     crypto::proof::{ProvingKey, VerifyingKey},
+    util::serial::Decodable,
     zk::{circuit::MintContract, vm},
+    Result,
 };
 
-use super::{serial::Decodable, Result};
-
 pub struct ContractLoader {}
 
 impl ContractLoader {
@@ -69,7 +69,7 @@ impl ContractLoader {
 
     pub fn create_prk(name: String) -> Result<()> {
         // TODO: implement this
-        let _mint_vk = ProvingKey::build(11, MintContract::default());
+        let _mint_pk = ProvingKey::build(11, MintContract::default());
         let _file = File::create(name + ".prk")?;
         // TODO: serialize and save file
         Ok(())
diff --git a/src/crypto/mod.rs b/src/crypto/mod.rs
index d52ed62d1..2b2e55cd1 100644
--- a/src/crypto/mod.rs
+++ b/src/crypto/mod.rs
@@ -4,6 +4,7 @@ pub mod coin;
 pub mod constants;
 pub mod diffie_hellman;
 pub mod keypair;
+pub mod loader;
 pub mod merkle_node;
 pub mod mint_proof;
 pub mod note;
diff --git a/src/crypto/proof.rs b/src/crypto/proof.rs
index e68439e2f..af1bca599 100644
--- a/src/crypto/proof.rs
+++ b/src/crypto/proof.rs
@@ -4,7 +4,7 @@ use std::io;
 use halo2::{
     plonk,
     plonk::Circuit,
-    poly::commitment,
+    poly::commitment::Params,
     transcript::{Blake2bRead, Blake2bWrite},
 };
 use pasta_curves::vesta;
@@ -17,13 +17,13 @@ use crate::{
 
 #[derive(Debug)]
 pub struct VerifyingKey {
-    pub params: commitment::Params<vesta::Affine>,
+    pub params: Params<vesta::Affine>,
     pub vk: plonk::VerifyingKey<vesta::Affine>,
 }
 
 impl VerifyingKey {
     pub fn build(k: u32, c: impl Circuit<DrkCircuitField>) -> Self {
-        let params = commitment::Params::new(k);
+        let params = Params::new(k);
         let vk = plonk::keygen_vk(&params, &c).unwrap();
         VerifyingKey { params, vk }
     }
@@ -31,13 +31,13 @@ impl VerifyingKey {
 
 #[derive(Debug)]
 pub struct ProvingKey {
-    pub params: commitment::Params<vesta::Affine>,
+    pub params: Params<vesta::Affine>,
     pub pk: plonk::ProvingKey<vesta::Affine>,
 }
 
 impl ProvingKey {
     pub fn build(k: u32, c: impl Circuit<DrkCircuitField>) -> Self {
-        let params = commitment::Params::new(k);
+        let params = Params::new(k);
         let vk = plonk::keygen_vk(&params, &c).unwrap();
         let pk = plonk::keygen_pk(&params, vk, &c).unwrap();
         ProvingKey { params, pk }