feat: allow a streamed proposal channel on top of existing one

starkware-libs · Nov 27, 2024 · fd5c84b · fd5c84b
1 parent a510291
commit fd5c84b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context_test.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context_test.rs
@@ -160,7 +160,11 @@ async fn validate_proposal_success() {
         broadcasted_messages_receiver: inbound_network_receiver,
         broadcast_topic_client: outbound_network_sender,
     } = subscriber_channels;
+<<<<<<< HEAD
     let (outbound_internal_sender, _inbound_internal_receiver, _) =
+=======
+    let (outbound_internal_sender, _inbound_internal_receiver) =
+>>>>>>> 883a253be (feat: allow a streamed proposal channel on top of existing one)
         StreamHandler::get_channels(inbound_network_receiver, outbound_network_sender);
 
     let mut context = SequencerConsensusContext::new(
@@ -213,7 +217,11 @@ async fn repropose() {
         broadcasted_messages_receiver: inbound_network_receiver,
         broadcast_topic_client: outbound_network_sender,
     } = subscriber_channels;
+<<<<<<< HEAD
     let (outbound_internal_sender, _inbound_internal_receiver, _) =
+=======
+    let (outbound_internal_sender, _inbound_internal_receiver) =
+>>>>>>> 883a253be (feat: allow a streamed proposal channel on top of existing one)
         StreamHandler::get_channels(inbound_network_receiver, outbound_network_sender);
 
     let mut context = SequencerConsensusContext::new(