|
|
@@ -360,9 +360,13 @@ mod tests {
|
|
|
|
|
|
// We should be unable to submit another report for bridge 0 due
|
|
|
// to pending report for bridge 0
|
|
|
- let report_submit_request = report_submit::request(rng, lox_cred.clone(), 0, [true, false, false]);
|
|
|
- let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) = report_submit_request.unwrap();
|
|
|
- let report_submit_response = th.ba.handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
+ let report_submit_request =
|
|
|
+ report_submit::request(rng, lox_cred.clone(), 0, [true, false, false]);
|
|
|
+ let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) =
|
|
|
+ report_submit_request.unwrap();
|
|
|
+ let report_submit_response =
|
|
|
+ th.ba
|
|
|
+ .handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
assert!(report_submit_response.is_err());
|
|
|
|
|
|
// Let the report time out
|
|
|
@@ -437,7 +441,8 @@ mod tests {
|
|
|
|
|
|
// Try to submit reports for bridges 1 and 2 (fails because
|
|
|
// we are not in pending state)
|
|
|
- let report_submit_request = report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
+ let report_submit_request =
|
|
|
+ report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
assert!(report_submit_request.is_err());
|
|
|
|
|
|
// Enter pending state
|
|
|
@@ -448,9 +453,13 @@ mod tests {
|
|
|
|
|
|
// Try to submit reports for bridges 1 and 2 (fails because
|
|
|
// there is a pending report for bridge 2)
|
|
|
- let report_submit_request = report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
- let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) = report_submit_request.unwrap();
|
|
|
- let report_submit_response = th.ba.handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
+ let report_submit_request =
|
|
|
+ report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
+ let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) =
|
|
|
+ report_submit_request.unwrap();
|
|
|
+ let report_submit_response =
|
|
|
+ th.ba
|
|
|
+ .handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
assert!(report_submit_response.is_err());
|
|
|
|
|
|
// Bridge 2 is not blocked
|
|
|
@@ -490,10 +499,9 @@ mod tests {
|
|
|
);
|
|
|
|
|
|
// Two of them are accessible, and one is blocked
|
|
|
- th.ba.report_table.process_scan_result(
|
|
|
- &bucket[0].get_hashed_fingerprint(),
|
|
|
- ReportStatus::Blocked,
|
|
|
- );
|
|
|
+ th.ba
|
|
|
+ .report_table
|
|
|
+ .process_scan_result(&bucket[0].get_hashed_fingerprint(), ReportStatus::Blocked);
|
|
|
th.ba.bridge_blocked(&bucket[0], &mut th.bdb);
|
|
|
th.ba.report_table.process_scan_result(
|
|
|
&bucket[1].get_hashed_fingerprint(),
|
|
|
@@ -519,13 +527,18 @@ mod tests {
|
|
|
|
|
|
// Can't submit more reports because we've already submitted too
|
|
|
// many false reports
|
|
|
- let report_submit_request = report_submit::request(rng, lox_cred.clone(), 2, [false, true, true]);
|
|
|
+ let report_submit_request =
|
|
|
+ report_submit::request(rng, lox_cred.clone(), 2, [false, true, true]);
|
|
|
assert!(report_submit_request.is_err());
|
|
|
|
|
|
// Can't just lie about the number of false reports
|
|
|
- let report_submit_request = report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
- let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) = report_submit_request.unwrap();
|
|
|
- let report_submit_response = th.ba.handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
+ let report_submit_request =
|
|
|
+ report_submit::request(rng, lox_cred.clone(), 0, [false, true, true]);
|
|
|
+ let ((rs_request, _rs_client_state), D_server, bridges_being_reported_server) =
|
|
|
+ report_submit_request.unwrap();
|
|
|
+ let report_submit_response =
|
|
|
+ th.ba
|
|
|
+ .handle_report_submit(rs_request, D_server, bridges_being_reported_server);
|
|
|
assert!(report_submit_response.is_err());
|
|
|
|
|
|
// Resolve
|