merge to upstream main

Signed-off-by: shamb0 <[email protected]>

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<TYPES: NodeType, S> Expectations<TYPES, S> {
     }
 }
 
-pub struct ExternalEventsExpectations<TYPES: NodeType> {
-    pub output_asserts: Vec<Box<dyn Predicate<Arc<Event<TYPES>>>>>,
-}
-
-impl<TYPES: NodeType> ExternalEventsExpectations<TYPES> {
-    pub fn from_outputs(output_asserts: Vec<Box<dyn Predicate<Arc<Event<TYPES>>>>>) -> Self {
-        Self { output_asserts }
-    }
-}
-
 pub fn panic_extra_output_in_script<S>(stage_number: usize, script_name: String, output: &S)
 where
     S: std::fmt::Debug,

crates/types/src/event.rs

@@ -173,7 +173,6 @@ pub enum EventType<TYPES: NodeType> {
     /// A message destined for external listeners was received
     ExternalMessageReceived(Vec<u8>),
 }
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
 /// A list of actions that we track for nodes
 pub enum HotShotAction {