Skip to content

Commit 4dd334d

Browse files
boquan-fangBoquan Fang
authored and
dougch
committed
build(deps): update bolero requirements (#2496)
Co-authored-by: Boquan Fang <bqfang@amazon.com>
1 parent a7936b0 commit 4dd334d

File tree

32 files changed

+54
-54
lines changed

32 files changed

+54
-54
lines changed

‎common/s2n-codec/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ checked_range_unsafe = []
1919
generator = ["bolero-generator"]
2020

2121
[dependencies]
22-
bolero-generator = { version = "0.12", default-features = false, optional = true }
22+
bolero-generator = { version = "0.13", default-features = false, optional = true }
2323
byteorder = { version = "1.1", default-features = false }
2424
bytes = { version = "1", default-features = false, optional = true }
2525
zerocopy = { version = "0.7", features = ["derive"] }
2626

2727
[dev-dependencies]
28-
bolero = "0.12"
29-
bolero-generator = "0.12"
28+
bolero = "0.13"
29+
bolero-generator = "0.13"
3030

3131
[package.metadata.kani]
3232
flags = { tests = true }

‎common/s2n-codec/src/decoder/checked_range.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl bolero::TypeGenerator for CheckedRange {
1717
fn generate<D: bolero::Driver>(driver: &mut D) -> Option<Self> {
1818
use bolero::ValueGenerator;
1919

20-
let start = bolero::gen::<usize>().generate(driver)?;
20+
let start = bolero::produce::<usize>().generate(driver)?;
2121
let end = (start..).generate(driver)?;
2222
Some(CheckedRange::new(start, end, core::ptr::null()))
2323
}

‎common/s2n-codec/src/unaligned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ macro_rules! unaligned_integer_type {
4343
#[cfg(any(test, feature = "generator"))]
4444
impl bolero_generator::TypeGenerator for $name {
4545
fn generate<D: bolero_generator::Driver>(driver: &mut D) -> Option<Self> {
46-
Some(Self::new_truncated(driver.gen()?))
46+
Some(Self::new_truncated(driver.produce()?))
4747
}
4848
}
4949

‎common/s2n-codec/src/zerocopy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ macro_rules! zerocopy_network_integer {
294294
#[cfg(feature = "generator")]
295295
impl TypeGenerator for $name {
296296
fn generate<D: bolero_generator::Driver>(driver: &mut D) -> Option<Self> {
297-
Some(Self::new(driver.gen()?))
297+
Some(Self::new(driver.produce()?))
298298
}
299299
}
300300

‎dc/s2n-quic-dc/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ arrayvec = "0.7"
2020
atomic-waker = "1"
2121
aws-lc-rs = "1"
2222
bitflags = "2"
23-
bolero-generator = { version = "0.12", default-features = false, optional = true }
23+
bolero-generator = { version = "0.13", default-features = false, optional = true }
2424
bytes = "1"
2525
crossbeam-channel = "0.5"
2626
crossbeam-epoch = "0.9"
@@ -48,8 +48,8 @@ parking_lot = "0.12"
4848
bitvec = { version = "1.0.1", default-features = false }
4949

5050
[dev-dependencies]
51-
bolero = "0.12"
52-
bolero-generator = "0.12"
51+
bolero = "0.13"
52+
bolero-generator = "0.13"
5353
insta = "1"
5454
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }
5555
s2n-quic-core = { path = "../../quic/s2n-quic-core", features = ["testing"] }

‎dc/s2n-quic-dc/src/path/secret/receiver/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ fn unseen() {
306306
#[cfg_attr(miri, ignore)] // this test is too expensive for miri
307307
fn insert_unequal() {
308308
// Make sure the two packet numbers are not the same
309-
let gen = bolero::gen::<(KeyId, KeyId)>().filter_gen(|(a, b)| a != b);
309+
let gen = bolero::produce::<(KeyId, KeyId)>().filter_gen(|(a, b)| a != b);
310310

311311
check!()
312312
.with_generator(gen)

‎dc/wireshark/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ s2n-quic-core = { path = "../../quic/s2n-quic-core" }
1414
s2n-quic-dc = { path = "../s2n-quic-dc" }
1515

1616
[dev-dependencies]
17-
bolero = "0.12"
17+
bolero = "0.13"
1818
s2n-quic-core = { path = "../../quic/s2n-quic-core", features = ["testing", "generator"] }
1919
s2n-quic-dc = { path = "../s2n-quic-dc", features = ["testing"] }
2020

‎quic/s2n-quic-core/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ usdt = ["dep:probe"]
2929

3030
[dependencies]
3131
atomic-waker = { version = "1", optional = true }
32-
bolero-generator = { version = "0.12", default-features = false, optional = true }
32+
bolero-generator = { version = "0.13", default-features = false, optional = true }
3333
byteorder = { version = "1", default-features = false }
3434
bytes = { version = "1", optional = true, default-features = false }
3535
crossbeam-utils = { version = "0.8", optional = true }
@@ -49,8 +49,8 @@ futures-test = { version = "0.3", optional = true } # For testing Waker interact
4949
once_cell = { version = "1", optional = true }
5050

5151
[dev-dependencies]
52-
bolero = "0.12"
53-
bolero-generator = "0.12"
52+
bolero = "0.13"
53+
bolero-generator = "0.13"
5454
insta = { version = "1", features = ["json"] }
5555
futures = "0.3"
5656
futures-test = "0.3"

‎quic/s2n-quic-core/src/buffer/deque/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ impl Model {
160160
// even with the minimal amount of parameter bounds, this proof's memory consumption explodes
161161
#[cfg_attr(kani, cfg(kani_slow))]
162162
fn model_test() {
163-
let ops = bolero::gen::<Vec<Op>>().with().len(..=OPS_LEN);
163+
let ops = bolero::produce::<Vec<Op>>().with().len(..=OPS_LEN);
164164

165165
check!().with_generator(ops).for_each(|ops| {
166166
let mut model = Model::default();

‎quic/s2n-quic-core/src/crypto/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ use std::convert::TryInto;
1616
fn round_trip() {
1717
check!()
1818
.with_generator((
19-
gen()
19+
produce()
2020
.map_gen(VarInt::from_u32)
2121
.map_gen(|value| PacketNumberSpace::Initial.new_packet_number(value)),
22-
gen::<Vec<u8>>(),
22+
produce::<Vec<u8>>(),
2323
))
2424
.for_each(|(largest_packet_number, input)| {
2525
let mut buffer = input.clone();

‎quic/s2n-quic-core/src/inet/ipv4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ mod tests {
757757
#[test]
758758
#[cfg_attr(kani, kani::proof, kani::unwind(5), kani::solver(kissat))]
759759
fn scope_test() {
760-
let g = gen::<[u8; 4]>().map_gen(IpV4Address::from);
760+
let g = produce::<[u8; 4]>().map_gen(IpV4Address::from);
761761
check!().with_generator(g).cloned().for_each(|subject| {
762762
use ip::UnicastScope::*;
763763

‎quic/s2n-quic-core/src/inet/ipv6.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ mod tests {
669669
#[test]
670670
#[cfg_attr(kani, kani::proof, kani::unwind(17), kani::solver(kissat))]
671671
fn scope_test() {
672-
let g = gen::<[u8; 16]>().map_gen(IpV6Address::from);
672+
let g = produce::<[u8; 16]>().map_gen(IpV6Address::from);
673673
check!().with_generator(g).cloned().for_each(|subject| {
674674
use ip::UnicastScope::*;
675675

‎quic/s2n-quic-core/src/interval_set/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fn interval_set_test() {
113113
#[cfg_attr(miri, ignore)] // This test is too expensive for miri to complete in a reasonable amount of time
114114
fn interval_set_inset_range_test() {
115115
// Generate valid ranges (lb <= ub)
116-
let gen = gen::<(i32, i32, i32)>().filter_gen(|(a, b, _c)| a <= b);
116+
let gen = produce::<(i32, i32, i32)>().filter_gen(|(a, b, _c)| a <= b);
117117

118118
check!().with_generator(gen).for_each(|(lb, ub, elem)| {
119119
let mut set: IntervalSet<i32> = IntervalSet::new();

‎quic/s2n-quic-core/src/packet/number/sliding_window.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ mod test {
475475
#[cfg_attr(miri, ignore)] // this test is too expensive for miri
476476
fn insert_test() {
477477
// Make sure the two packet numbers are not the same
478-
let gen = gen::<(VarInt, VarInt)>().filter_gen(|(a, b)| a != b);
478+
let gen = produce::<(VarInt, VarInt)>().filter_gen(|(a, b)| a != b);
479479

480480
check!()
481481
.with_generator(gen)

‎quic/s2n-quic-core/src/packet/number/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn gen_packet_number_space() -> impl ValueGenerator<Output = PacketNumberSpace>
4141
}
4242

4343
fn gen_packet_number(space: PacketNumberSpace) -> impl ValueGenerator<Output = PacketNumber> {
44-
gen().map_gen(move |packet_number| {
44+
produce().map_gen(move |packet_number| {
4545
space.new_packet_number(match VarInt::new(packet_number) {
4646
Ok(packet_number) => packet_number,
4747
Err(_) => VarInt::from_u32(packet_number as u32),

‎quic/s2n-quic-core/src/recovery/congestion_controller/fuzz_target.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ fn cubic_fuzz() {
247247
check!()
248248
.with_generator((
249249
MINIMUM_MAX_DATAGRAM_SIZE..=9000,
250-
gen(),
251-
gen::<Vec<Operation>>(),
250+
produce(),
251+
produce::<Vec<Operation>>(),
252252
))
253253
.for_each(|(max_datagram_size, seed, operations)| {
254254
let mut model = Model::new(CubicCongestionController::new(
@@ -271,8 +271,8 @@ fn bbr_fuzz() {
271271
check!()
272272
.with_generator((
273273
MINIMUM_MAX_DATAGRAM_SIZE..=9000,
274-
gen(),
275-
gen::<Vec<Operation>>(),
274+
produce(),
275+
produce::<Vec<Operation>>(),
276276
))
277277
.for_each(|(max_datagram_size, seed, operations)| {
278278
let mut model = Model::new(BbrCongestionController::new(

‎quic/s2n-quic-core/src/recovery/pacing/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ fn interval_differential_test() {
274274
1_000_000..u32::MAX, // RTT ranges from 1ms to ~4sec
275275
2400..u32::MAX, // congestion window ranges from the minimum window (2 * MINIMUM_MAX_DATAGRAM_SIZE) to u32::MAX
276276
MINIMUM_MAX_DATAGRAM_SIZE..=9000, // max_datagram_size ranges from MINIMUM_MAX_DATAGRAM_SIZE to 9000
277-
gen(),
277+
produce(),
278278
))
279279
.cloned()
280280
.for_each(|(rtt, congestion_window, max_datagram_size, slow_start)| {

‎quic/s2n-quic-core/src/stream/testing.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pub struct Data {
3838
#[cfg(any(feature = "generator", test))]
3939
impl TypeGenerator for Data {
4040
fn generate<D: bolero_generator::Driver>(driver: &mut D) -> Option<Self> {
41-
let offset = gen::<u64>().generate(driver)?;
42-
let final_offset = gen::<Option<u64>>()
41+
let offset = produce::<u64>().generate(driver)?;
42+
let final_offset = produce::<Option<u64>>()
4343
.with()
4444
.value(offset..)
4545
.generate(driver)?;

‎quic/s2n-quic-core/src/sync/cursor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ mod tests {
540540
#[cfg_attr(kani, kani::proof, kani::unwind(5), kani::solver(kissat))]
541541
fn oracle_test() {
542542
check!()
543-
.with_generator((1..=MAX_POWER_OF_TWO, gen(), gen::<Ops>()))
543+
.with_generator((1..=MAX_POWER_OF_TWO, produce(), produce::<Ops>()))
544544
.for_each(|(power_of_two, init_cursor, ops)| model(*power_of_two, *init_cursor, ops));
545545
}
546546
}

‎quic/s2n-quic-core/src/sync/spsc/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ type Operations = Vec<Operation>;
250250
fn model() {
251251
let max_capacity = if cfg!(any(kani, miri)) { 2 } else { 64 };
252252

253-
let generator = (1usize..max_capacity, gen::<Operations>());
253+
let generator = (1usize..max_capacity, produce::<Operations>());
254254

255255
check!()
256256
.with_generator(generator)
@@ -272,7 +272,7 @@ fn model() {
272272
fn model_zst() {
273273
let max_capacity = if cfg!(any(kani, miri)) { 2 } else { 64 };
274274

275-
let generator = (1usize..max_capacity, gen::<Operations>());
275+
let generator = (1usize..max_capacity, produce::<Operations>());
276276

277277
check!()
278278
.with_generator(generator)
@@ -295,7 +295,7 @@ fn alloc_test() {
295295
};
296296

297297
check!()
298-
.with_generator((capacity, gen::<u8>()))
298+
.with_generator((capacity, produce::<u8>()))
299299
.cloned()
300300
.for_each(|(capacity, push_value)| {
301301
let (mut send, mut recv) = channel(capacity);

‎quic/s2n-quic-core/src/varint/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn two_byte_sequence_test() {
115115
// the s2n-quic implementation always chooses the smallest encoding possible.
116116
// this means if we wish to test two-byte sequences, we need to encode a number
117117
// that is > 63.
118-
let g = gen::<(u8, u8)>().filter_gen(|(_, b)| *b > 63);
118+
let g = produce::<(u8, u8)>().filter_gen(|(_, b)| *b > 63);
119119

120120
bolero::check!()
121121
.with_generator(g)
@@ -138,7 +138,7 @@ fn four_byte_sequence_test() {
138138
// The s2n-quic implementation always chooses the smallest encoding possible.
139139
// This means if we wish to test the four-byte sequences, we need to encode a number
140140
// that is > 16383 or 0b0011 1111 1111 1111.
141-
let g = gen::<(u8, u8, u8)>().filter_gen(|(_, _, c)| *c > 0x3f);
141+
let g = produce::<(u8, u8, u8)>().filter_gen(|(_, _, c)| *c > 0x3f);
142142

143143
bolero::check!().with_generator(g).cloned().for_each(
144144
|(mut first_byte, second_byte, third_byte)| {
@@ -161,7 +161,7 @@ fn eight_byte_sequence_test() {
161161
// The s2n-quic implementation always chooses the smallest encoding possible.
162162
// This means if we wish to test eight-byte sequences, we need to encode a number
163163
// that is > 1073741823 or 0b0011 1111 1111 1111 1111 1111 1111 1111
164-
let g = gen::<(u8, u8, u8, u8)>().filter_gen(|(_, _, _, d)| *d > 0x3f);
164+
let g = produce::<(u8, u8, u8, u8)>().filter_gen(|(_, _, _, d)| *d > 0x3f);
165165

166166
bolero::check!().with_generator(g).cloned().for_each(
167167
|(mut first_byte, second_byte, third_byte, fourth_byte)| {

‎quic/s2n-quic-platform/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ xdp = ["s2n-quic-xdp"]
2121

2222
[dependencies]
2323
bach = { version = "0.0.6", optional = true }
24-
bolero-generator = { version = "0.12", default-features = false, optional = true }
24+
bolero-generator = { version = "0.13", default-features = false, optional = true }
2525
cfg-if = "1"
2626
futures = { version = "0.3", default-features = false, features = ["async-await"], optional = true }
2727
lazy_static = { version = "1", optional = true }
@@ -37,8 +37,8 @@ libc = "0.2"
3737

3838
[dev-dependencies]
3939
bach = { version = "0.0.6" }
40-
bolero = "0.12"
41-
bolero-generator = "0.12"
40+
bolero = "0.13"
41+
bolero-generator = "0.13"
4242
futures = { version = "0.3", features = ["std"] }
4343
insta = { version = "1", features = ["json"] }
4444
s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }

‎quic/s2n-quic-platform/src/message.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ mod tests {
162162
#[test]
163163
#[cfg_attr(kani, kani::proof, kani::unwind(17), kani::solver(minisat))]
164164
fn rx_message_test() {
165-
let path = bolero::gen::<path::RemoteAddress>();
166-
let ecn = bolero::gen();
167-
let segment_size = bolero::gen();
165+
let path = bolero::produce::<path::RemoteAddress>();
166+
let ecn = bolero::produce();
167+
let segment_size = bolero::produce();
168168
let max_payload_len = if cfg!(kani) { 16 } else { u16::MAX as usize };
169169
let payload_len = 0..=max_payload_len;
170170

‎quic/s2n-quic-platform/src/message/msg/tests.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use super::*;
5-
use bolero::{check, gen};
5+
use bolero::{check, produce};
66
use core::mem::zeroed;
77
use s2n_quic_core::inet::{SocketAddress, Unspecified};
88

@@ -73,7 +73,7 @@ fn address_inverse_pair_test() {
7373
fn handle_get_set_test() {
7474
check!()
7575
.with_generator((
76-
gen::<Handle>(),
76+
produce::<Handle>(),
7777
1..=crate::features::gso::MaxSegments::MAX.into(),
7878
))
7979
.cloned()

‎quic/s2n-quic-transport/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ siphasher = "1.0"
2929
smallvec = { version = "1", default-features = false }
3030

3131
[dev-dependencies]
32-
bolero = "0.12"
32+
bolero = "0.13"
3333
futures-test = "0.3" # For testing Waker interactions
3434
insta = { version = "1", features = ["json"] }
3535
s2n-codec = { path = "../../common/s2n-codec", features = ["testing"] }

‎quic/s2n-quic-transport/src/connection/close_sender.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,12 @@ mod tests {
335335
let rtt = close_time.clone().map_gen(|t| t / 3);
336336
let packet_durations = (0..=5000).map_gen(Duration::from_millis);
337337
let packet_sizes = 1..=9000;
338-
let events = gen::<Vec<_>>()
338+
let events = produce::<Vec<_>>()
339339
.with()
340340
.values((packet_durations, packet_sizes));
341341

342342
bolero::check!()
343-
.with_generator((close_time, rtt, events, gen()))
343+
.with_generator((close_time, rtt, events, produce()))
344344
.for_each(|(close_time, rtt, events, is_validated)| {
345345
let mut sender = CloseSender::default();
346346
let mut clock = Clock::default();

‎quic/s2n-quic-transport/src/sync/data_sender.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ mod tests {
753753
#[test]
754754
fn model() {
755755
check!()
756-
.with_generator((gen(), gen::<Vec<Event>>().with().len(1usize..128)))
756+
.with_generator((produce(), produce::<Vec<Event>>().with().len(1usize..128)))
757757
.for_each(|(id, events)| {
758758
check_model(events, id);
759759
});

‎quic/s2n-quic/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ zerocopy = { version = "0.7", optional = true, features = ["derive"] }
8484
zeroize = { version = "1", optional = true, default-features = false }
8585

8686
[dev-dependencies]
87-
bolero = { version = "0.12" }
87+
bolero = { version = "0.13" }
8888
s2n-quic-core = { path = "../s2n-quic-core", features = ["branch-tracing", "event-tracing", "probe-tracing", "testing"] }
8989
s2n-quic-platform = { path = "../s2n-quic-platform", features = ["testing"] }
9090
s2n-quic-transport = { path = "../s2n-quic-transport", features = ["unstable_resumption", "unstable-provider-dc"] }

‎quic/s2n-quic/src/provider/address_token/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ mod tests {
748748
//# For this design to work,
749749
//# the token MUST be covered by integrity protection against
750750
//# modification or falsification by clients.
751-
let generator = bolero::generator::gen::<Vec<u8>>()
751+
let generator = bolero::generator::produce::<Vec<u8>>()
752752
.with()
753753
.len(Format::TOKEN_LEN);
754754
bolero::check!()

‎tools/xdp/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ members = ["s2n-quic-xdp", "tester", "xtask"]
33
resolver = "2"
44

55
[workspace.dependencies]
6-
bolero = "0.12"
7-
bolero-generator = { version = "0.12", default-features = false }
6+
bolero = "0.13"
7+
bolero-generator = { version = "0.13", default-features = false }

‎tools/xdp/s2n-quic-xdp/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ s2n-quic-core = { version = "=0.54.0", path = "../../../quic/s2n-quic-core" }
2323
tokio = { version = "1", features = ["net"], optional = true }
2424

2525
[dev-dependencies]
26-
bolero = "0.12"
26+
bolero = "0.13"
2727
futures = "0.3"
2828
pin-project-lite = "0.2"
2929
rand = "0.9"

0 commit comments

Comments
 (0)