From 31be96ac35c1195fe07b1f7100c0f2d3940e09f6 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Mon, 1 Feb 2021 14:27:49 -0800
Subject: [PATCH] Upgrade to 0.2.0

---
 Cargo.toml     |  2 +-
 src/parties.rs | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 71d4ee7..b0a7a24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-fuzzytags = {path="../../fuzzymetatag/"}
+fuzzytags = "0.2.0"
 rand = "0.8.3"
 rand_distr = "0.4.0"
 hashbrown = "0.9.1"
diff --git a/src/parties.rs b/src/parties.rs
index 6c24e93..38c065e 100644
--- a/src/parties.rs
+++ b/src/parties.rs
@@ -1,18 +1,18 @@
 use crate::server::SimulatedServer;
-use fuzzytags::FuzzyTagKeyPair;
+use fuzzytags::FuzzySecretKey;
 use rand::distributions::Distribution;
 use rand::Rng;
 use rand_distr::num_traits::ToPrimitive;
 
 pub struct SimulatedParties {
-    parties: Vec<FuzzyTagKeyPair>,
+    parties: Vec<FuzzySecretKey>,
 }
 
 impl SimulatedParties {
     pub fn new_simulation(num_parties: usize, gamma: usize) -> SimulatedParties {
         let mut parties = vec![];
         for _p in 0..num_parties {
-            let key = FuzzyTagKeyPair::generate(gamma);
+            let key = FuzzySecretKey::generate(gamma);
             parties.push(key);
         }
         SimulatedParties { parties }
@@ -24,8 +24,8 @@ impl SimulatedParties {
     {
         for party in self.parties.iter() {
             let n = rng.gen_range(min_p..max_p);
-            let detection_key = party.secret_key.extract(n);
-            server.register_key(&detection_key, &party.public_key);
+            let detection_key = party.extract(n);
+            server.register_key(&detection_key, &party.public_key());
         }
     }
 
@@ -36,9 +36,9 @@ impl SimulatedParties {
     {
         let v = distribution.sample(rng).to_u16().unwrap();
         let receiver = rng.gen_range(0..self.parties.len());
-        println!("[Oracle] {} received {} messages", self.parties.get(receiver).unwrap().public_key.id(), v);
+        println!("[Oracle] {} received {} messages", self.parties.get(receiver).unwrap().public_key().id(), v);
         for _i in 0..v {
-            let tag = self.parties.get(receiver).unwrap().public_key.generate_tag();
+            let tag = self.parties.get(receiver).unwrap().public_key().generate_tag();
             server.add_message(tag);
             //message_oracle.push(receiver);
         }