From a5d1efc207520dea54f9df87ac26202eee29f30f Mon Sep 17 00:00:00 2001
From: Sam Kim <skim13@cs.stanford.edu>
Date: Tue, 5 Oct 2021 10:23:23 -0400
Subject: [PATCH] Rust fmt and clippy

---
 zk-token-sdk/src/instruction/close_account.rs    |  4 ++--
 .../src/instruction/update_account_pk.rs         | 16 +++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/zk-token-sdk/src/instruction/close_account.rs b/zk-token-sdk/src/instruction/close_account.rs
index 1341711a8..cbd705c35 100644
--- a/zk-token-sdk/src/instruction/close_account.rs
+++ b/zk-token-sdk/src/instruction/close_account.rs
@@ -123,7 +123,7 @@ impl CloseAccountProof {
         // Edge case #2: if D is zeroed, but C is not, then this is an invalid ciphertext
         if D.is_identity() {
             transcript.append_point(b"R", &R);
-            return Err(ProofError::VerificationError)
+            return Err(ProofError::VerificationError);
         }
 
         // generate a challenge scalar
@@ -148,7 +148,7 @@ impl CloseAccountProof {
 mod test {
     use super::*;
     use crate::encryption::elgamal::ElGamal;
-    use crate::encryption::pedersen::{Pedersen, PedersenOpening, PedersenDecryptHandle};
+    use crate::encryption::pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening};
 
     #[test]
     fn test_close_account_correctness() {
diff --git a/zk-token-sdk/src/instruction/update_account_pk.rs b/zk-token-sdk/src/instruction/update_account_pk.rs
index cf08fa57a..adb818bc3 100644
--- a/zk-token-sdk/src/instruction/update_account_pk.rs
+++ b/zk-token-sdk/src/instruction/update_account_pk.rs
@@ -215,7 +215,7 @@ impl UpdateAccountPkProof {
 mod test {
     use super::*;
     use crate::encryption::elgamal::ElGamal;
-    use crate::encryption::pedersen::{Pedersen, PedersenOpening, PedersenDecryptHandle};
+    use crate::encryption::pedersen::{Pedersen, PedersenDecryptHandle, PedersenOpening};
 
     #[test]
     fn test_update_account_public_key_general_cases() {
@@ -284,6 +284,7 @@ mod test {
             .is_ok());
     }
 
+    #[test]
     fn test_update_account_public_key_partially_zeroed_ciphertexts() {
         let (current_pk, current_sk) = ElGamal::new();
         let (new_pk, new_sk) = ElGamal::new();
@@ -308,9 +309,7 @@ mod test {
             &zeroed_comm_ciphertext,
             &new_ct,
         );
-        assert!(proof
-            .verify(&zeroed_comm_ciphertext, &new_ct)
-            .is_err());
+        assert!(proof.verify(&zeroed_comm_ciphertext, &new_ct).is_err());
 
         let zeroed_handle_ciphertext = ElGamalCiphertext {
             message_comm: balance_ciphertext.message_comm,
@@ -324,9 +323,7 @@ mod test {
             &zeroed_handle_ciphertext,
             &new_ct,
         );
-        assert!(proof
-            .verify(&zeroed_handle_ciphertext, &new_ct)
-            .is_err());
+        assert!(proof.verify(&zeroed_handle_ciphertext, &new_ct).is_err());
 
         // Partially zeroed cipehrtext as new ciphertext
         let zeroed_comm_ciphertext = ElGamalCiphertext {
@@ -342,9 +339,7 @@ mod test {
             &current_ct,
             &zeroed_comm_ciphertext,
         );
-        assert!(proof
-            .verify(&current_ct, &zeroed_comm_ciphertext)
-            .is_err());
+        assert!(proof.verify(&current_ct, &zeroed_comm_ciphertext).is_err());
 
         let zeroed_handle_ciphertext = ElGamalCiphertext {
             message_comm: balance_ciphertext.message_comm,
@@ -361,6 +356,5 @@ mod test {
         assert!(proof
             .verify(&current_ct, &zeroed_handle_ciphertext)
             .is_err());
-
     }
 }