Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 238 additions & 19 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ prometheus = "0.13.4"
querystring = "1.1.0"
quickcheck = { version = "1.0.3", default-features = false }
quickcheck_macros = "1.1.0"
rand = "0.9"
rand = "0.10"
rayon = "1.11.0"
reqwest = { version = "0.12.28", default-features = false, features = ["rustls-tls-webpki-roots-no-provider"] }
regex = "1.12.3"
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/aggregator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ use prio::{
flp::gadgets::{Mul, ParallelSum},
vdaf::prio3::{Prio3, Prio3Count, Prio3Histogram, Prio3Sum, Prio3SumVec},
};
use rand::{Rng, random, rng};
use rand::{RngExt, random, rng};
use reqwest::Client;
use tokio::{select, try_join};
use tracing::{Level, debug, error, info, warn};
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/aggregator/aggregation_job_creator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ use prio::{
prio3::{Prio3, Prio3Count, Prio3Histogram, Prio3Sum, Prio3SumVec},
},
};
use rand::{Rng, random, rng};
use rand::{RngExt, random, rng};
use tokio::{
time::{self, Instant, MissedTickBehavior, sleep_until},
try_join,
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/aggregator/aggregation_job_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use opentelemetry::{
KeyValue,
metrics::{Counter, Histogram},
};
use rand::{Rng as _, rng};
use rand::{RngExt as _, rng};
use tokio::try_join;
use tracing::{Level, warn};

Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/aggregator/report_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use janus_aggregator_core::{
};
use janus_core::{Runtime, time::Clock};
use janus_messages::TaskId;
use rand::{Rng, rng};
use rand::{RngExt, rng};
use tokio::{
select,
sync::{mpsc, oneshot},
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/binaries/janus_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use k8s_openapi::api::core::v1::Secret;
use kube::api::{ObjectMeta, PostParams};
use opentelemetry::global::meter;
use prio::codec::Decode as _;
use rand::{Rng, distr::StandardUniform, rng};
use rand::{RngExt, distr::StandardUniform, rng};
use serde::{Deserialize, Serialize};
use tokio::{
fs,
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/binary_utils/job_driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use janus_aggregator_core::{
};
use janus_core::{Runtime, time::Clock};
use opentelemetry::{KeyValue, metrics::Meter};
use rand::{Rng, rng};
use rand::{RngExt, rng};
use tokio::{
sync::{Semaphore, SemaphorePermit},
time::{self, Instant},
Expand Down
2 changes: 1 addition & 1 deletion aggregator_api/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use janus_messages::{
Duration, HpkeAeadId, HpkeConfig, HpkeConfigId, HpkeKdfId, HpkeKemId, HpkePublicKey, Role,
TaskId, Time, taskprov::TimePrecision,
};
use rand::{Rng, distr::StandardUniform, random, rng};
use rand::{RngExt, distr::StandardUniform, random, rng};
use serde_test::{Token, assert_ser_tokens, assert_tokens};
use trillium::{Handler, Status};
use trillium_testing::{
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/src/datastore/models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use prio::{
topology::ping_pong::PingPongContinuation,
vdaf::Aggregatable,
};
use rand::{distr::StandardUniform, prelude::Distribution};
use rand::{RngExt, distr::StandardUniform, prelude::Distribution};
use serde::{Deserialize, Serialize};

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/src/datastore/task_counters_tests.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use janus_core::{test_util::install_test_trace_subscriber, time::MockClock, vdaf::VdafInstance};
use rand::{Rng, random, rng};
use rand::{RngExt, random, rng};

use crate::{
datastore::{
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/src/datastore/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use janus_core::{
test_util::testcontainers::Postgres,
time::{Clock, MockClock},
};
use rand::{Rng, distr::StandardUniform, random, rng};
use rand::{RngExt, distr::StandardUniform, random, rng};
use sqlx::{
Connection, PgConnection,
migrate::{Migrate, Migrator},
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/src/datastore/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use prio::{
topology::ping_pong::PingPongMessage,
vdaf::{dummy, prio3::Prio3Count},
};
use rand::{Rng, distr::StandardUniform, random, rng};
use rand::{RngExt, distr::StandardUniform, random, rng};
use tokio::{time::timeout, try_join};
use url::Url;

Expand Down
4 changes: 2 additions & 2 deletions aggregator_core/src/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use janus_messages::{
Time, batch_mode, taskprov::TimePrecision,
};
use postgres_types::{FromSql, ToSql};
use rand::{Rng, distr::StandardUniform, random, rng};
use rand::{RngExt, distr::StandardUniform, random, rng};
use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error as _};
use url::Url;

Expand Down Expand Up @@ -795,7 +795,7 @@ pub mod test_util {
AggregateShareId, AggregationJobId, AggregationJobStep, CollectionJobId, Duration,
HpkeConfigId, Role, TaskId, Time, taskprov::TimePrecision,
};
use rand::{Rng, distr::StandardUniform, random, rng};
use rand::{RngExt, distr::StandardUniform, random, rng};
use url::Url;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion aggregator_core/src/taskprov.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
use educe::Educe;
use janus_core::{auth_tokens::AuthenticationToken, vdaf::VdafInstance};
use janus_messages::{Duration, HpkeConfig, Role, TaskId};
use rand::{distr::StandardUniform, prelude::Distribution};
use rand::{RngExt, distr::StandardUniform, prelude::Distribution};
use serde::{
Deserialize, Serialize, Serializer,
de::{self, Visitor},
Expand Down
2 changes: 1 addition & 1 deletion core/src/auth_tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use aws_lc_rs::{
use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD};
use educe::Educe;
use http::{HeaderValue, header::AUTHORIZATION};
use rand::{distr::StandardUniform, prelude::Distribution};
use rand::{RngExt, distr::StandardUniform, prelude::Distribution};
use regex::Regex;
use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error};

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/tests/integration/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use prio::{
flp::gadgets::ParallelSumMultithreaded,
vdaf::{self, dummy, prio3::Prio3},
};
use rand::{Rng, random, rng, seq::IteratorRandom as _};
use rand::{RngExt, random, rng, seq::IteratorRandom as _};
use tokio::time::{self, sleep};
use url::Url;

Expand Down
2 changes: 1 addition & 1 deletion interop_binaries/src/commands/janus_interop_collector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use prio::{
flp::gadgets::ParallelSum,
vdaf::{self, prio3::Prio3},
};
use rand::{distr::StandardUniform, prelude::Distribution, random};
use rand::{RngExt, distr::StandardUniform, prelude::Distribution, random};
use reqwest::Url;
use serde::{Deserialize, Serialize};
use tokio::{sync::Mutex, task::JoinHandle};
Expand Down
2 changes: 1 addition & 1 deletion messages/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use prio::{
},
topology::ping_pong::PingPongMessage,
};
use rand::{Rng, distr::StandardUniform, prelude::Distribution};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution};
use serde::{
Deserialize, Serialize, Serializer,
de::{self, Visitor},
Expand Down
Loading