Skip to content

Commit f618759

Browse files
aszepieniecjan-ferdinandSword-Smith
committed
chore: Update upstream dependencies
- Triton VM -> 0.48.0 - strum -> 0.27.0 - rand -> 0.9.0 Co-authored-by: Ferdinand Sauer <[email protected]> Co-authored-by: Thorkil Schmidiger <[email protected]>
1 parent 6643860 commit f618759

File tree

139 files changed

+471
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+471
-427
lines changed

tasm-lib/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ itertools = "0"
3131
ndarray = { version = "0.16" }
3232
num = "0"
3333
num-traits = "0"
34-
rand = "0.8.5"
34+
rand = "0.9.0"
3535
serde = { version = "1", features = ["derive"] }
3636
serde_json = "1"
37-
strum = { version = "0.26", features = ["derive"] }
37+
strum = { version = "0.27", features = ["derive"] }
3838
tasm-object-derive.workspace = true
39-
triton-vm = { version = "0.45.0", default-features = false }
39+
triton-vm = { version = "0.48.0", default-features = false }
4040

4141
[dev-dependencies.cargo-husky]
4242
version = "1"

tasm-lib/benchmarks/tasmlib_mmr_bag_peaks.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
{
33
"name": "tasmlib_mmr_bag_peaks",
44
"benchmark_result": {
5-
"clock_cycle_count": 181,
6-
"hash_table_height": 234,
7-
"u32_table_height": 8,
8-
"op_stack_table_height": 320,
9-
"ram_table_height": 151
5+
"clock_cycle_count": 97,
6+
"hash_table_height": 120,
7+
"u32_table_height": 51,
8+
"op_stack_table_height": 124,
9+
"ram_table_height": 44
1010
},
1111
"case": "CommonCase"
1212
},
1313
{
1414
"name": "tasmlib_mmr_bag_peaks",
1515
"benchmark_result": {
16-
"clock_cycle_count": 331,
17-
"hash_table_height": 414,
18-
"u32_table_height": 8,
19-
"op_stack_table_height": 620,
20-
"ram_table_height": 301
16+
"clock_cycle_count": 142,
17+
"hash_table_height": 174,
18+
"u32_table_height": 71,
19+
"op_stack_table_height": 214,
20+
"ram_table_height": 89
2121
},
2222
"case": "WorstCase"
2323
}

tasm-lib/src/arithmetic/bfe/primitive_root_of_unity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ mod tests {
211211
match bench_case {
212212
Some(BenchmarkCase::CommonCase) => 1_u64 << 10,
213213
Some(BenchmarkCase::WorstCase) => 1 << 32,
214-
None => 1 << StdRng::from_seed(seed).gen_range(1..=32),
214+
None => 1 << StdRng::from_seed(seed).random_range(1..=32),
215215
}
216216
}
217217
}

tasm-lib/src/arithmetic/i128/lt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mod tests {
9797
}
9898

9999
fn pseudorandom_args(&self, seed: [u8; 32], _: Option<BenchmarkCase>) -> Self::Args {
100-
StdRng::from_seed(seed).gen()
100+
StdRng::from_seed(seed).random()
101101
}
102102

103103
fn corner_case_args(&self) -> Vec<Self::Args> {
@@ -145,7 +145,7 @@ mod tests {
145145
stack_index_bad_word: usize,
146146
bad_word: BFieldElement,
147147
) -> InitVmState {
148-
let mut stack = Lt.set_up_test_stack(random());
148+
let mut stack = Lt.set_up_test_stack(rand::random());
149149
let last_elem_index = stack.len() - 1;
150150
stack[last_elem_index - stack_index_bad_word] = bad_word;
151151

tasm-lib/src/arithmetic/i128/shift_right.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ mod tests {
276276

277277
fn pseudorandom_args(&self, seed: [u8; 32], _: Option<BenchmarkCase>) -> Self::Args {
278278
let mut rng = StdRng::from_seed(seed);
279-
(rng.gen(), rng.gen_range(0..128))
279+
(rng.random(), rng.random_range(0..128))
280280
}
281281
}
282282

tasm-lib/src/arithmetic/u128/lt.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ impl BasicSnippet for Lt {
8989

9090
#[cfg(test)]
9191
mod tests {
92+
use rand::rngs::StdRng;
93+
9294
use super::*;
9395
use crate::test_helpers::test_rust_equivalence_given_execution_state;
9496
use crate::test_prelude::*;
@@ -102,7 +104,7 @@ mod tests {
102104
}
103105

104106
fn pseudorandom_args(&self, seed: [u8; 32], _: Option<BenchmarkCase>) -> Self::Args {
105-
StdRng::from_seed(seed).gen()
107+
StdRng::from_seed(seed).random()
106108
}
107109
}
108110

tasm-lib/src/arithmetic/u128/overflowing_add.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ impl BasicSnippet for OverflowingAdd {
9191

9292
#[cfg(test)]
9393
pub(crate) mod tests {
94+
use rand::rngs::StdRng;
95+
9496
use super::*;
9597
use crate::test_prelude::*;
9698

@@ -131,7 +133,7 @@ pub(crate) mod tests {
131133
}
132134

133135
fn pseudorandom_args(&self, seed: [u8; 32], _: Option<BenchmarkCase>) -> Self::Args {
134-
StdRng::from_seed(seed).gen()
136+
StdRng::from_seed(seed).random()
135137
}
136138

137139
fn corner_case_args(&self) -> Vec<Self::Args> {

tasm-lib/src/arithmetic/u128/safe_add.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ impl BasicSnippet for SafeAdd {
5050
mod tests {
5151
use super::*;
5252
use crate::test_prelude::*;
53+
use rand::rngs::StdRng;
5354

5455
impl SafeAdd {
5556
fn assert_expected_add_behavior(&self, lhs: u128, rhs: u128) {
@@ -80,8 +81,8 @@ mod tests {
8081

8182
fn pseudorandom_args(&self, seed: [u8; 32], _: Option<BenchmarkCase>) -> Self::Args {
8283
let mut rng = StdRng::from_seed(seed);
83-
let lhs = rng.gen();
84-
let rhs = rng.gen_range(0..=u128::MAX - lhs);
84+
let lhs = rng.random();
85+
let rhs = rng.random_range(0..=u128::MAX - lhs);
8586

8687
(lhs, rhs)
8788
}

tasm-lib/src/arithmetic/u128/safe_mul.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ impl BasicSnippet for SafeMul {
194194
mod tests {
195195
use super::*;
196196
use crate::test_prelude::*;
197+
use rand::rngs::StdRng;
197198

198199
impl SafeMul {
199200
fn test_assertion_failure(&self, left: u128, right: u128, error_ids: &[i128]) {
@@ -221,8 +222,8 @@ mod tests {
221222
) -> Self::Args {
222223
let Some(bench_case) = bench_case else {
223224
let mut rng = StdRng::from_seed(seed);
224-
let left = rng.gen_range(1..=u128::MAX);
225-
let right = rng.gen_range(0..=u128::MAX / left);
225+
let left = rng.random_range(1..=u128::MAX);
226+
let right = rng.random_range(0..=u128::MAX / left);
226227

227228
return (right, left);
228229
};

tasm-lib/src/arithmetic/u128/shift_left.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ impl BasicSnippet for ShiftLeft {
130130
mod tests {
131131
use super::*;
132132
use crate::test_prelude::*;
133+
use rand::rngs::StdRng;
133134

134135
impl Closure for ShiftLeft {
135136
type Args = <ShiftRight as Closure>::Args;
@@ -150,7 +151,7 @@ mod tests {
150151
match bench_case {
151152
Some(BenchmarkCase::CommonCase) => (0x1282, 15),
152153
Some(BenchmarkCase::WorstCase) => (0x123456789abcdef, 125),
153-
None => (rng.gen(), rng.gen_range(0..128)),
154+
None => (rng.random(), rng.random_range(0..128)),
154155
}
155156
}
156157

0 commit comments

Comments
 (0)