Simulation: Give user chance to use bridges each day
This commit is contained in:
parent
d9aa616d77
commit
6b6836dbae
|
@ -26,6 +26,9 @@ pub struct User {
|
||||||
|
|
||||||
// Does the user submit reports to Troll Patrol?
|
// Does the user submit reports to Troll Patrol?
|
||||||
submits_reports: bool,
|
submits_reports: bool,
|
||||||
|
|
||||||
|
// How likely is this user to use bridges on a given day?
|
||||||
|
prob_use_bridges: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl User {
|
impl User {
|
||||||
|
@ -63,12 +66,17 @@ impl User {
|
||||||
cc
|
cc
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Randomly determine how likely this user is to use bridges on
|
||||||
|
// a given day
|
||||||
|
let prob_use_bridges = rng.gen_range(0.0..=1.0);
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
censor: censor,
|
censor: censor,
|
||||||
country: cc,
|
country: cc,
|
||||||
primary_cred: cred,
|
primary_cred: cred,
|
||||||
secondary_cred: None,
|
secondary_cred: None,
|
||||||
submits_reports: submits_reports,
|
submits_reports: submits_reports,
|
||||||
|
prob_use_bridges: prob_use_bridges,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,12 +135,17 @@ impl User {
|
||||||
cc
|
cc
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Randomly determine how likely this user is to use bridges on
|
||||||
|
// a given day
|
||||||
|
let prob_use_bridges = rng.gen_range(0.0..=1.0);
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
censor: censor,
|
censor: censor,
|
||||||
country: cc,
|
country: cc,
|
||||||
primary_cred: friend_cred,
|
primary_cred: friend_cred,
|
||||||
secondary_cred: None,
|
secondary_cred: None,
|
||||||
submits_reports: submits_reports,
|
submits_reports: submits_reports,
|
||||||
|
prob_use_bridges: prob_use_bridges,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,180 +192,189 @@ impl User {
|
||||||
// newly invited friends and a vector of fingerprints of successfully
|
// newly invited friends and a vector of fingerprints of successfully
|
||||||
// contacted bridges.
|
// contacted bridges.
|
||||||
pub async fn daily_tasks(&mut self, state: &State) -> (Vec<User>, Vec<[u8; 20]>) {
|
pub async fn daily_tasks(&mut self, state: &State) -> (Vec<User>, Vec<[u8; 20]>) {
|
||||||
// Download bucket to see if bridge is still reachable
|
// Probabilistically decide if the user should use bridges today
|
||||||
// (We assume that this step can be done even if the user can't actually
|
let mut rng = rand::thread_rng();
|
||||||
// talk to the LA.)
|
let num: f64 = rng.gen_range(0.0..1.0);
|
||||||
let (bucket, reachcred) = get_bucket(&state.net, &self.primary_cred).await;
|
if num < self.prob_use_bridges {
|
||||||
let level = scalar_u32(&self.primary_cred.trust_level).unwrap();
|
// Download bucket to see if bridge is still reachable
|
||||||
|
// (We assume that this step can be done even if the user can't actually
|
||||||
|
// talk to the LA.)
|
||||||
|
let (bucket, reachcred) = get_bucket(&state.net, &self.primary_cred).await;
|
||||||
|
let level = scalar_u32(&self.primary_cred.trust_level).unwrap();
|
||||||
|
|
||||||
// Can we level up the main credential?
|
// Can we level up the main credential?
|
||||||
let can_level_up = reachcred.is_some()
|
let can_level_up = reachcred.is_some()
|
||||||
&& (level == 0 && eligible_for_trust_promotion(&state.net, &self.primary_cred).await
|
&& (level == 0
|
||||||
|| level > 0 && eligible_for_level_up(&state.net, &self.primary_cred).await);
|
&& eligible_for_trust_promotion(&state.net, &self.primary_cred).await
|
||||||
|
|| level > 0 && eligible_for_level_up(&state.net, &self.primary_cred).await);
|
||||||
|
|
||||||
// Can we migrate the main credential?
|
// Can we migrate the main credential?
|
||||||
let can_migrate = reachcred.is_none() && level >= MIN_TRUST_LEVEL;
|
let can_migrate = reachcred.is_none() && level >= MIN_TRUST_LEVEL;
|
||||||
|
|
||||||
// Can we level up the secondary credential?
|
// Can we level up the secondary credential?
|
||||||
let mut second_level_up = false;
|
let mut second_level_up = false;
|
||||||
|
|
||||||
let mut failed = Vec::<BridgeLine>::new();
|
let mut failed = Vec::<BridgeLine>::new();
|
||||||
let mut succeeded = Vec::<BridgeLine>::new();
|
let mut succeeded = Vec::<BridgeLine>::new();
|
||||||
for i in 0..bucket.len() {
|
for i in 0..bucket.len() {
|
||||||
// At level 0, we only have 1 bridge
|
// At level 0, we only have 1 bridge
|
||||||
if level > 0 || i == 0 {
|
if level > 0 || i == 0 {
|
||||||
if self.connect(&bucket[i]) {
|
if self.connect(&bucket[i]) {
|
||||||
succeeded.push(bucket[i]);
|
succeeded.push(bucket[i]);
|
||||||
|
} else {
|
||||||
|
failed.push(bucket[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let second_cred = if succeeded.len() < 1 {
|
||||||
|
if self.secondary_cred.is_some() {
|
||||||
|
std::mem::replace(&mut self.secondary_cred, None)
|
||||||
} else {
|
} else {
|
||||||
failed.push(bucket[i]);
|
// Get new credential
|
||||||
}
|
let cred = get_lox_credential(
|
||||||
}
|
&state.net,
|
||||||
}
|
&get_open_invitation(&state.net).await,
|
||||||
let second_cred = if succeeded.len() < 1 {
|
get_lox_pub(&state.la_pubkeys),
|
||||||
if self.secondary_cred.is_some() {
|
)
|
||||||
std::mem::replace(&mut self.secondary_cred, None)
|
.await
|
||||||
} else {
|
.0;
|
||||||
// Get new credential
|
Some(cred)
|
||||||
let cred = get_lox_credential(
|
|
||||||
&state.net,
|
|
||||||
&get_open_invitation(&state.net).await,
|
|
||||||
get_lox_pub(&state.la_pubkeys),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.0;
|
|
||||||
Some(cred)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// If we're able to connect with the primary credential, don't
|
|
||||||
// keep a secondary one.
|
|
||||||
None
|
|
||||||
};
|
|
||||||
if second_cred.is_some() {
|
|
||||||
let second_cred = second_cred.as_ref().unwrap();
|
|
||||||
let (second_bucket, second_reachcred) = get_bucket(&state.net, &second_cred).await;
|
|
||||||
if self.connect(&second_bucket[0]) {
|
|
||||||
succeeded.push(second_bucket[0]);
|
|
||||||
if second_reachcred.is_some()
|
|
||||||
&& eligible_for_trust_promotion(&state.net, &second_cred).await
|
|
||||||
{
|
|
||||||
second_level_up = true;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
failed.push(second_bucket[0]);
|
// If we're able to connect with the primary credential, don't
|
||||||
}
|
// keep a secondary one.
|
||||||
}
|
None
|
||||||
|
};
|
||||||
let mut negative_reports = Vec::<NegativeReport>::new();
|
if second_cred.is_some() {
|
||||||
let mut positive_reports = Vec::<PositiveReport>::new();
|
let second_cred = second_cred.as_ref().unwrap();
|
||||||
if self.submits_reports {
|
let (second_bucket, second_reachcred) = get_bucket(&state.net, &second_cred).await;
|
||||||
for bridge in &failed {
|
if self.connect(&second_bucket[0]) {
|
||||||
negative_reports.push(NegativeReport::from_bridgeline(
|
succeeded.push(second_bucket[0]);
|
||||||
*bridge,
|
if second_reachcred.is_some()
|
||||||
self.country.to_string(),
|
&& eligible_for_trust_promotion(&state.net, &second_cred).await
|
||||||
BridgeDistributor::Lox,
|
{
|
||||||
));
|
second_level_up = true;
|
||||||
}
|
}
|
||||||
if level >= 3 {
|
} else {
|
||||||
for bridge in &succeeded {
|
failed.push(second_bucket[0]);
|
||||||
positive_reports.push(
|
|
||||||
PositiveReport::from_lox_credential(
|
|
||||||
bridge.fingerprint,
|
|
||||||
None,
|
|
||||||
&self.primary_cred,
|
|
||||||
get_lox_pub(&state.la_pubkeys),
|
|
||||||
self.country.to_string(),
|
|
||||||
)
|
|
||||||
.unwrap(),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// We might restrict these steps to succeeded.len() > 0, but we do
|
let mut negative_reports = Vec::<NegativeReport>::new();
|
||||||
// assume the user can contact the LA somehow, so let's just allow it.
|
let mut positive_reports = Vec::<PositiveReport>::new();
|
||||||
if can_level_up {
|
if self.submits_reports {
|
||||||
let cred = level_up(
|
for bridge in &failed {
|
||||||
&state.net,
|
negative_reports.push(NegativeReport::from_bridgeline(
|
||||||
&self.primary_cred,
|
*bridge,
|
||||||
&reachcred.unwrap(),
|
self.country.to_string(),
|
||||||
get_lox_pub(&state.la_pubkeys),
|
BridgeDistributor::Lox,
|
||||||
get_reachability_pub(&state.la_pubkeys),
|
));
|
||||||
)
|
}
|
||||||
.await;
|
if level >= 3 {
|
||||||
self.primary_cred = cred;
|
for bridge in &succeeded {
|
||||||
self.secondary_cred = None;
|
positive_reports.push(
|
||||||
}
|
PositiveReport::from_lox_credential(
|
||||||
// We favor starting over at level 1 to migrating
|
bridge.fingerprint,
|
||||||
else if second_level_up {
|
None,
|
||||||
let second_cred = second_cred.as_ref().unwrap();
|
&self.primary_cred,
|
||||||
let cred = trust_migration(
|
get_lox_pub(&state.la_pubkeys),
|
||||||
&state.net,
|
self.country.to_string(),
|
||||||
&second_cred,
|
)
|
||||||
&trust_promotion(&state.net, &second_cred, get_lox_pub(&state.la_pubkeys)).await,
|
.unwrap(),
|
||||||
get_lox_pub(&state.la_pubkeys),
|
);
|
||||||
get_migration_pub(&state.la_pubkeys),
|
}
|
||||||
)
|
}
|
||||||
.await;
|
}
|
||||||
self.primary_cred = cred;
|
|
||||||
self.secondary_cred = None;
|
// We might restrict these steps to succeeded.len() > 0, but we do
|
||||||
} else if can_migrate {
|
// assume the user can contact the LA somehow, so let's just allow it.
|
||||||
let cred = blockage_migration(
|
if can_level_up {
|
||||||
&state.net,
|
let cred = level_up(
|
||||||
&self.primary_cred,
|
|
||||||
&check_blockage(
|
|
||||||
&state.net,
|
&state.net,
|
||||||
&self.primary_cred,
|
&self.primary_cred,
|
||||||
|
&reachcred.unwrap(),
|
||||||
get_lox_pub(&state.la_pubkeys),
|
get_lox_pub(&state.la_pubkeys),
|
||||||
|
get_reachability_pub(&state.la_pubkeys),
|
||||||
)
|
)
|
||||||
.await,
|
.await;
|
||||||
get_lox_pub(&state.la_pubkeys),
|
self.primary_cred = cred;
|
||||||
get_migration_pub(&state.la_pubkeys),
|
self.secondary_cred = None;
|
||||||
)
|
}
|
||||||
.await;
|
// We favor starting over at level 1 to migrating
|
||||||
self.primary_cred = cred;
|
else if second_level_up {
|
||||||
self.secondary_cred = None;
|
let second_cred = second_cred.as_ref().unwrap();
|
||||||
} else if second_cred.is_some() {
|
let cred = trust_migration(
|
||||||
// Couldn't connect with primary credential
|
&state.net,
|
||||||
if succeeded.len() > 0 {
|
&second_cred,
|
||||||
// Keep the second credential only if it's useful
|
&trust_promotion(&state.net, &second_cred, get_lox_pub(&state.la_pubkeys))
|
||||||
self.secondary_cred = second_cred;
|
.await,
|
||||||
|
get_lox_pub(&state.la_pubkeys),
|
||||||
|
get_migration_pub(&state.la_pubkeys),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
self.primary_cred = cred;
|
||||||
|
self.secondary_cred = None;
|
||||||
|
} else if can_migrate {
|
||||||
|
let cred = blockage_migration(
|
||||||
|
&state.net,
|
||||||
|
&self.primary_cred,
|
||||||
|
&check_blockage(
|
||||||
|
&state.net,
|
||||||
|
&self.primary_cred,
|
||||||
|
get_lox_pub(&state.la_pubkeys),
|
||||||
|
)
|
||||||
|
.await,
|
||||||
|
get_lox_pub(&state.la_pubkeys),
|
||||||
|
get_migration_pub(&state.la_pubkeys),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
self.primary_cred = cred;
|
||||||
|
self.secondary_cred = None;
|
||||||
|
} else if second_cred.is_some() {
|
||||||
|
// Couldn't connect with primary credential
|
||||||
|
if succeeded.len() > 0 {
|
||||||
|
// Keep the second credential only if it's useful
|
||||||
|
self.secondary_cred = second_cred;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if negative_reports.len() > 0 {
|
if negative_reports.len() > 0 {
|
||||||
Self::send_negative_reports(&state, negative_reports).await;
|
Self::send_negative_reports(&state, negative_reports).await;
|
||||||
}
|
}
|
||||||
if positive_reports.len() > 0 {
|
if positive_reports.len() > 0 {
|
||||||
Self::send_positive_reports(&state, positive_reports).await;
|
Self::send_positive_reports(&state, positive_reports).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Invite friends if applicable
|
// Invite friends if applicable
|
||||||
let invitations = scalar_u32(&self.primary_cred.invites_remaining).unwrap();
|
let invitations = scalar_u32(&self.primary_cred.invites_remaining).unwrap();
|
||||||
let mut new_friends = Vec::<User>::new();
|
let mut new_friends = Vec::<User>::new();
|
||||||
for _i in 0..invitations {
|
for _i in 0..invitations {
|
||||||
let mut rng = rand::thread_rng();
|
let mut rng = rand::thread_rng();
|
||||||
let num: f64 = rng.gen_range(0.0..1.0);
|
let num: f64 = rng.gen_range(0.0..1.0);
|
||||||
if num < state.prob_user_invites_friend {
|
if num < state.prob_user_invites_friend {
|
||||||
match self.invite(&state).await {
|
match self.invite(&state).await {
|
||||||
Ok(friend) => {
|
Ok(friend) => {
|
||||||
// You really shouldn't push your friends, especially
|
// You really shouldn't push your friends, especially
|
||||||
// new ones whose boundaries you might not know well.
|
// new ones whose boundaries you might not know well.
|
||||||
new_friends.push(friend);
|
new_friends.push(friend);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("{}", e);
|
println!("{}", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// List of fingerprints we contacted. This should not actually be more
|
// List of fingerprints we contacted. This should not actually be more
|
||||||
// than one.
|
// than one.
|
||||||
let mut connections = Vec::<[u8; 20]>::new();
|
let mut connections = Vec::<[u8; 20]>::new();
|
||||||
for bridge in succeeded {
|
for bridge in succeeded {
|
||||||
connections.push(bridge.get_hashed_fingerprint());
|
connections.push(bridge.get_hashed_fingerprint());
|
||||||
}
|
}
|
||||||
|
|
||||||
(new_friends, connections)
|
(new_friends, connections)
|
||||||
|
} else {
|
||||||
|
(Vec::<User>::new(), Vec::<[u8; 20]>::new())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue