From 11f1190fe220441585e0a0c54ed645bba5d52703 Mon Sep 17 00:00:00 2001 From: shamb0 Date: Fri, 16 Aug 2024 11:11:37 +0530 Subject: [PATCH] merge to upstream main Signed-off-by: shamb0 --- crates/testing/src/script.rs | 12 +----------- crates/types/src/event.rs | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/crates/testing/src/script.rs b/crates/testing/src/script.rs index eb46c2d86e..b25e286f9f 100644 --- a/crates/testing/src/script.rs +++ b/crates/testing/src/script.rs @@ -7,7 +7,7 @@ use std::{sync::Arc, time::Duration}; use hotshot_task_impls::events::HotShotEvent; -use hotshot_types::{event::Event, traits::node_implementation::NodeType}; +use hotshot_types::traits::node_implementation::NodeType; use crate::predicates::{Predicate, PredicateResult}; @@ -66,16 +66,6 @@ impl Expectations { } } -pub struct ExternalEventsExpectations { - pub output_asserts: Vec>>>>, -} - -impl ExternalEventsExpectations { - pub fn from_outputs(output_asserts: Vec>>>>) -> Self { - Self { output_asserts } - } -} - pub fn panic_extra_output_in_script(stage_number: usize, script_name: String, output: &S) where S: std::fmt::Debug, diff --git a/crates/types/src/event.rs b/crates/types/src/event.rs index a2785e4c29..88c429d5f0 100644 --- a/crates/types/src/event.rs +++ b/crates/types/src/event.rs @@ -173,7 +173,6 @@ pub enum EventType { /// A message destined for external listeners was received ExternalMessageReceived(Vec), } - #[derive(Debug, Serialize, Deserialize, Clone)] /// A list of actions that we track for nodes pub enum HotShotAction {