[CX_CLEANUP] Integrate new Task, in the code and remove the old

.github/workflows/test-sequencer.yml

@@ -55,7 +55,6 @@ jobs:
           hotshot-state-prover = { path = "${GITHUB_WORKSPACE}/hotshot/crates/hotshot-state-prover" }
           hotshot-orchestrator = { path = "${GITHUB_WORKSPACE}/hotshot/crates/orchestrator" }
           hotshot-web-server = { path = "${GITHUB_WORKSPACE}/hotshot/crates/web_server" }
-          hotshot-task = { path = "${GITHUB_WORKSPACE}/hotshot/crates/task" }
           hotshot-task-impls = { path = "${GITHUB_WORKSPACE}/hotshot/crates/task-impls" }
           hotshot-testing = { path = "${GITHUB_WORKSPACE}/hotshot/crates/testing" }
           hotshot-types = { path = "${GITHUB_WORKSPACE}/hotshot/crates/types" }

Cargo.toml

@@ -33,9 +33,11 @@ ark-ed-on-bn254 = "0.4"
 ark-ff = "0.4"
 ark-serialize = "0.4"
 ark-std = { version = "0.4", default-features = false }
+async-broadcast = "0.6.0"
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.4.1", default-features = false, features = [
         "logging-utils",
 ] }
+task = { git = "https://github.com/EspressoSystems/HotShotTasks.git" }
 async-lock = "2.8"
 async-trait = "0.1.77"
 bincode = "1.3.3"

crates/constants/src/lib.rs

@@ -28,3 +28,6 @@ pub struct Version {
 
 /// Constant for protocol version 0.1.
 pub const VERSION_0_1: Version = Version { major: 0, minor: 1 };
+
+/// Default Channel Size for consensus event sharing
+pub const EVENT_CHANNEL_SIZE: usize = 100_000;

crates/hotshot/Cargo.toml

@@ -79,6 +79,7 @@ name = "orchestrator-combined"
 path = "examples/combined/orchestrator.rs"
 
 [dependencies]
+async-broadcast = { workspace = true }
 async-compatibility-layer = { workspace = true }
 async-lock = { workspace = true }
 async-trait = { workspace = true }
@@ -96,7 +97,6 @@ hotshot-web-server = { version = "0.1.1", path = "../web_server", default-featur
 hotshot-orchestrator = { version = "0.1.1", path = "../orchestrator", default-features = false }
 hotshot-types = { path = "../types", version = "0.1.0", default-features = false }
 hotshot-utils = { path = "../utils" }
-hotshot-task = { path = "../task", version = "0.1.0", default-features = false }
 hotshot-task-impls = { path = "../task-impls", version = "0.1.0", default-features = false }
 libp2p-identity = { workspace = true }
 libp2p-networking = { workspace = true }
@@ -108,6 +108,7 @@ time = { workspace = true }
 derive_more = "0.99.17"
 portpicker = "0.1.1"
 lru = "0.12.2"
+hotshot-task = { path = "../task" }
 
 tracing = { workspace = true }
 

crates/hotshot/examples/infra/mod.rs

@@ -23,7 +23,6 @@ use hotshot_orchestrator::{
     client::{OrchestratorClient, ValidatorArgs},
     config::{NetworkConfig, NetworkConfigFile, WebServerConfig},
 };
-use hotshot_task::task::FilterEvent;
 use hotshot_testing::{
     block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
     state_types::TestInstanceState,
@@ -393,7 +392,7 @@ pub trait RunDA<
     /// Starts HotShot consensus, returns when consensus has finished
     async fn run_hotshot(
         &self,
-        mut context: SystemContextHandle<TYPES, NODE>,
+        context: SystemContextHandle<TYPES, NODE>,
         transactions: &mut Vec<TestTransaction>,
         transactions_to_send_per_round: u64,
     ) {
@@ -413,7 +412,7 @@ pub trait RunDA<
         error!("Starting HotShot example!");
         let start = Instant::now();
 
-        let (mut event_stream, _streamid) = context.get_event_stream(FilterEvent::default()).await;
+        let mut event_stream = context.get_event_stream();
         let mut anchor_view: TYPES::Time = <TYPES::Time as ConsensusTime>::genesis();
         let mut num_successful_commits = 0;