Skip to content

Commit

Permalink
test: Don't print to std-out in trait test runners
Browse files Browse the repository at this point in the history
These prints were spamming the test runs downstream in neptune-core.

Co-authored-by: Alan Szepieniec <alan@neptune.cash>
  • Loading branch information
Sword-Smith and aszepieniec committed Oct 4, 2024
1 parent b473594 commit 110926f
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 71 deletions.
13 changes: 1 addition & 12 deletions tasm-lib/src/traits/accessor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,12 @@ where
}

fn test(&self) {
for (i, corner_case) in self
for corner_case in self
.accessor
.borrow()
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!(
"testing {} corner case number {i}",
self.accessor.borrow().entrypoint(),
);

let stdin = vec![];
let nd = NonDeterminism::default().with_ram(corner_case.memory);
test_rust_equivalence_given_complete_state(
Expand All @@ -128,11 +122,6 @@ where
let mut rng: StdRng = SeedableRng::from_seed(seed);
for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {} common case with seed: {:#4x?}",
self.accessor.borrow().entrypoint(),
seed
);
let AccessorInitialState { stack, memory } = self
.accessor
.borrow()
Expand Down
13 changes: 1 addition & 12 deletions tasm-lib/src/traits/algorithm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,12 @@ where
}

fn test(&self) {
for (i, corner_case) in self
for corner_case in self
.algorithm
.borrow()
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!(
"testing {} corner case number {i}",
self.algorithm.borrow().entrypoint(),
);

let stdin = vec![];
test_rust_equivalence_given_complete_state(
self,
Expand All @@ -150,11 +144,6 @@ where
let mut rng: StdRng = SeedableRng::from_seed(seed);
for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {} common case with seed: {:#4x?}",
self.algorithm.borrow().entrypoint(),
seed
);
let AlgorithmInitialState {
stack,
nondeterminism,
Expand Down
5 changes: 0 additions & 5 deletions tasm-lib/src/traits/closure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@ impl<C: Closure + 'static> RustShadow for ShadowedClosure<C> {

for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {} common case with seed: {:x?}",
self.closure.borrow().entrypoint(),
seed
);
let stack = self.closure.borrow().pseudorandom_initial_state(seed, None);

let stdin = vec![];
Expand Down
6 changes: 1 addition & 5 deletions tasm-lib/src/traits/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,12 @@ where

/// Test rust-tasm equivalence.
fn test(&self) {
let entrypoint = self.function.borrow().entrypoint();
for (i, cornercase_test) in self
for cornercase_test in self
.function
.borrow()
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!("testing {entrypoint} corner case number {i}");
self.test_initial_state(cornercase_test);
}

Expand All @@ -141,7 +138,6 @@ where

for _ in 0..num_rng_states {
let seed: [u8; 32] = rng.gen();
println!("testing {entrypoint} with seed: {:#03x?}", seed);
self.test_initial_state(
self.function
.borrow()
Expand Down
13 changes: 1 addition & 12 deletions tasm-lib/src/traits/mem_preserver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,12 @@ where
}

fn test(&self) {
for (i, corner_case) in self
for corner_case in self
.mem_preserver
.borrow()
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!(
"testing {} corner case number {i}",
self.mem_preserver.borrow().entrypoint(),
);

let stdin: Vec<_> = corner_case.public_input.into();

test_rust_equivalence_given_complete_state(
Expand All @@ -139,11 +133,6 @@ where
let mut rng: StdRng = SeedableRng::from_seed(seed);
for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {} common case with seed: {:#4x?}",
self.mem_preserver.borrow().entrypoint(),
seed
);
let MemPreserverInitialState {
stack,
public_input,
Expand Down
15 changes: 2 additions & 13 deletions tasm-lib/src/traits/procedure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;

use itertools::Itertools;
use rand::prelude::*;
use triton_vm::prelude::*;

Expand Down Expand Up @@ -117,23 +116,13 @@ impl<P: Procedure + 'static> RustShadow for ShadowedProcedure<P> {
let seed: [u8; 32] = thread_rng().gen();
let mut rng: StdRng = SeedableRng::from_seed(seed);
let procedure = &self.procedure.borrow();
let entrypoint = procedure.entrypoint();

for (i, corner_case) in procedure
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!("testing {entrypoint} corner case number {i}");

for corner_case in procedure.corner_case_initial_states().into_iter() {
self.test_initial_state(corner_case);
}

for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {entrypoint} common case with seed: [{}]",
seed.iter().map(|h| format!("{:#04x}", h)).join(", ")
);
let state = procedure.pseudorandom_initial_state(seed, None);

self.test_initial_state(state);
Expand Down
13 changes: 1 addition & 12 deletions tasm-lib/src/traits/read_only_algorithm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,12 @@ where
}

fn test(&self) {
for (i, corner_case) in self
for corner_case in self
.read_only_algorithm
.borrow()
.corner_case_initial_states()
.into_iter()
.enumerate()
{
println!(
"testing {} corner case number {i}",
self.read_only_algorithm.borrow().entrypoint(),
);

let stdin = vec![];
test_rust_equivalence_given_complete_state(
self,
Expand All @@ -133,11 +127,6 @@ where
let mut rng: StdRng = SeedableRng::from_seed(seed);
for _ in 0..num_states {
let seed: [u8; 32] = rng.gen();
println!(
"testing {} common case with seed: {:#4x?}",
self.read_only_algorithm.borrow().entrypoint(),
seed
);
let ReadOnlyAlgorithmInitialState {
stack,
nondeterminism,
Expand Down

0 comments on commit 110926f

Please sign in to comment.