Upgrade to 0.2.0

This commit is contained in:
Sarah Jamie Lewis 2021-02-01 14:27:49 -08:00
parent 0f940e5bab
commit 31be96ac35
2 changed files with 8 additions and 8 deletions

View File

@ -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"

View File

@ -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);
}