From 69010d1502300aa80f632d2862c2ebcecaad4cf8 Mon Sep 17 00:00:00 2001
From: Sean Bowe <ewillbefull@gmail.com>
Date: Mon, 5 Mar 2018 15:25:40 -0700
Subject: [PATCH] Relocate Pedersen hash personalization enum.

---
 src/circuit/pedersen_hash.rs | 19 +------------------
 src/pedersen_hash.rs         | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/circuit/pedersen_hash.rs b/src/circuit/pedersen_hash.rs
index 7eec3bb..6daafeb 100644
--- a/src/circuit/pedersen_hash.rs
+++ b/src/circuit/pedersen_hash.rs
@@ -9,13 +9,7 @@ use bellman::{
     ConstraintSystem
 };
 use super::lookup::*;
-
-// TODO: ensure these match the spec
-pub enum Personalization {
-    NoteCommitment,
-    AnotherPersonalization,
-    MerkleTree(usize)
-}
+pub use pedersen_hash::Personalization;
 
 impl Personalization {
     fn get_constant_bools(&self) -> Vec<Boolean> {
@@ -24,17 +18,6 @@ impl Personalization {
         .map(|e| Boolean::constant(e))
         .collect()
     }
-
-    pub fn get_bits(&self) -> Vec<bool> {
-        match *self {
-            Personalization::NoteCommitment =>
-                vec![false, false, false, false, false, false],
-            Personalization::AnotherPersonalization =>
-                vec![false, false, false, false, false, true],
-            Personalization::MerkleTree(_) =>
-                vec![false, false, false, false, true, false],
-        }
-    }
 }
 
 pub fn pedersen_hash<E: JubjubEngine, CS>(
diff --git a/src/pedersen_hash.rs b/src/pedersen_hash.rs
index 1eb75f6..83c3965 100644
--- a/src/pedersen_hash.rs
+++ b/src/pedersen_hash.rs
@@ -1,7 +1,24 @@
 use jubjub::*;
 use pairing::*;
 
-pub use circuit::pedersen_hash::Personalization;
+pub enum Personalization {
+    NoteCommitment,
+    AnotherPersonalization,
+    MerkleTree(usize)
+}
+
+impl Personalization {
+    pub fn get_bits(&self) -> Vec<bool> {
+        match *self {
+            Personalization::NoteCommitment =>
+                vec![false, false, false, false, false, false],
+            Personalization::AnotherPersonalization =>
+                vec![false, false, false, false, false, true],
+            Personalization::MerkleTree(_) =>
+                vec![false, false, false, false, true, false],
+        }
+    }
+}
 
 pub fn pedersen_hash<E, I>(
     personalization: Personalization,