remove api and rely on consensus task instead

EspressoSystems · Mar 28, 2024 · 9d86916 · 9d86916
1 parent c878b47
commit 9d86916
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 567 deletions.
diff --git a/crates/hotshot/src/tasks/mod.rs b/crates/hotshot/src/tasks/mod.rs
@@ -198,12 +198,8 @@ pub async fn inject_consensus_polls<
 }
 
 /// Setup polls for the given `quorum_proposal`.
-pub async fn inject_quorum_proposal_polls<
-    TYPES: NodeType,
-    I: NodeImplementation<TYPES>,
-    A: ConsensusApi<TYPES, I>,
->(
-    quorum_proposal_task_state: &QuorumProposalTaskState<TYPES, I, A>,
+pub async fn inject_quorum_proposal_polls<TYPES: NodeType, I: NodeImplementation<TYPES>>(
+    quorum_proposal_task_state: &QuorumProposalTaskState<TYPES, I>,
 ) {
     // Poll (forever) for the latest quorum proposal
     quorum_proposal_task_state

diff --git a/crates/hotshot/src/tasks/task_state.rs b/crates/hotshot/src/tasks/task_state.rs
@@ -211,11 +211,11 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> CreateTaskState<TYPES, I>
 
 #[async_trait]
 impl<TYPES: NodeType, I: NodeImplementation<TYPES>> CreateTaskState<TYPES, I>
-    for QuorumProposalTaskState<TYPES, I, SystemContextHandle<TYPES, I>>
+    for QuorumProposalTaskState<TYPES, I>
 {
     async fn create_from(
         handle: &SystemContextHandle<TYPES, I>,
-    ) -> QuorumProposalTaskState<TYPES, I, SystemContextHandle<TYPES, I>> {
+    ) -> QuorumProposalTaskState<TYPES, I> {
         let consensus = handle.hotshot.get_consensus();
         QuorumProposalTaskState {
             latest_proposed_view: handle.get_cur_view().await,
@@ -229,7 +229,6 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>> CreateTaskState<TYPES, I>
             timeout_task: None,
             public_key: handle.public_key().clone(),
             timeout: handle.hotshot.config.next_view_timeout,
-            api: handle.clone(),
             id: handle.hotshot.id,
         }
     }