From d4019f39a477055678e57e11c248b807c52fde66 Mon Sep 17 00:00:00 2001 From: Omar Abdulla Date: Wed, 22 Oct 2025 13:44:31 +0300 Subject: [PATCH] Remove corpus from the report --- crates/core/src/helpers/test.rs | 9 +++++++++ crates/report/src/aggregator.rs | 17 +++-------------- crates/report/src/runner_event.rs | 6 ------ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/crates/core/src/helpers/test.rs b/crates/core/src/helpers/test.rs index ff30b86..261f29f 100644 --- a/crates/core/src/helpers/test.rs +++ b/crates/core/src/helpers/test.rs @@ -32,9 +32,18 @@ pub async fn create_test_definitions_stream<'a>( only_execute_failed_tests: Option<&Report>, reporter: Reporter, ) -> impl Stream> { + let cloned_reporter = reporter.clone(); stream::iter( corpus .cases_iterator() + .inspect(move |(metadata_file, ..)| { + cloned_reporter + .report_metadata_file_discovery_event( + metadata_file.metadata_file_path.clone(), + metadata_file.content.clone(), + ) + .unwrap(); + }) .map(move |(metadata_file, case_idx, case, mode)| { let reporter = reporter.clone(); diff --git a/crates/report/src/aggregator.rs b/crates/report/src/aggregator.rs index b293fa1..dcad23a 100644 --- a/crates/report/src/aggregator.rs +++ b/crates/report/src/aggregator.rs @@ -5,13 +5,13 @@ use std::{ collections::{BTreeMap, BTreeSet, HashMap, HashSet}, fs::OpenOptions, path::PathBuf, - time::{Instant, SystemTime, UNIX_EPOCH}, + time::{SystemTime, UNIX_EPOCH}, }; -use alloy::primitives::{Address, BlockNumber, BlockTimestamp, TxHash}; +use alloy::primitives::{Address, BlockNumber, TxHash}; use anyhow::{Context as _, Result}; use indexmap::IndexMap; -use revive_dt_common::types::{ParsedTestSpecifier, PlatformIdentifier}; +use revive_dt_common::types::PlatformIdentifier; use revive_dt_compiler::{CompilerInput, CompilerOutput, Mode}; use revive_dt_config::Context; use revive_dt_format::{case::CaseIdx, metadata::ContractInstance, steps::StepPath}; @@ -67,9 +67,6 @@ impl ReportAggregator { RunnerEvent::SubscribeToEvents(event) => { self.handle_subscribe_to_events_event(*event); } - RunnerEvent::CorpusDiscovery(event) => { - self.handle_corpus_file_discovered_event(*event) - } RunnerEvent::MetadataFileDiscovery(event) => { self.handle_metadata_file_discovery_event(*event); } @@ -152,10 +149,6 @@ impl ReportAggregator { let _ = event.tx.send(self.listener_tx.subscribe()); } - fn handle_corpus_file_discovered_event(&mut self, event: CorpusDiscoveryEvent) { - self.report.corpora.extend(event.test_specifiers); - } - fn handle_metadata_file_discovery_event(&mut self, event: MetadataFileDiscoveryEvent) { self.report.metadata_files.insert(event.path.clone()); } @@ -423,9 +416,6 @@ impl ReportAggregator { pub struct Report { /// The context that the tool was started up with. pub context: Context, - /// The list of corpus files that the tool found. - #[serde_as(as = "Vec")] - pub corpora: Vec, /// The list of metadata files that were found by the tool. pub metadata_files: BTreeSet, /// Metrics from the execution. @@ -440,7 +430,6 @@ impl Report { Self { context, metrics: Default::default(), - corpora: Default::default(), metadata_files: Default::default(), execution_information: Default::default(), } diff --git a/crates/report/src/runner_event.rs b/crates/report/src/runner_event.rs index 9f3d62b..c91334a 100644 --- a/crates/report/src/runner_event.rs +++ b/crates/report/src/runner_event.rs @@ -6,7 +6,6 @@ use std::{collections::BTreeMap, path::PathBuf, sync::Arc}; use alloy::primitives::Address; use anyhow::Context as _; use indexmap::IndexMap; -use revive_dt_common::types::ParsedTestSpecifier; use revive_dt_common::types::PlatformIdentifier; use revive_dt_compiler::{CompilerInput, CompilerOutput}; use revive_dt_format::metadata::ContractInstance; @@ -481,11 +480,6 @@ define_event! { /// The channel that the aggregator is to send the receive side of the channel on. tx: oneshot::Sender> }, - /// An event emitted by runners when they've discovered a corpus file. - CorpusDiscovery { - /// The contents of the corpus file. - test_specifiers: Vec - }, /// An event emitted by runners when they've discovered a metadata file. MetadataFileDiscovery { /// The path of the metadata file discovered.