From 443e7178c88b80c3fc6ad9d21b7fd86f0e3ea289 Mon Sep 17 00:00:00 2001 From: Dori Medini Date: Mon, 29 Jul 2024 13:38:34 +0300 Subject: [PATCH] fix: conflict resolution Signed-off-by: Dori Medini --- .github/workflows/committer_ci.yml | 8 ----- .../papyrus_consensus/src/state_machine.rs | 31 ------------------- 2 files changed, 39 deletions(-) diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index bd96e1275f..d82054465a 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -83,16 +83,8 @@ jobs: # Input files didn't change. - if: env.OLD_BENCH_INPUT_FILES_PREFIX == env.NEW_BENCH_INPUT_FILES_PREFIX run: | -<<<<<<< HEAD - mv ./crates/committer_cli/benches/tree_flow_inputs.json_bu ./crates/committer_cli/test_inputs/tree_flow_inputs.json - mv ./crates/committer_cli/benches/committer_flow_inputs.json_bu ./crates/committer_cli/test_inputs/committer_flow_inputs.json -||||||| a9dc431b - mv ./crates/committer_cli/benches/tree_flow_inputs.json_bu ./crates/committer_cli/benches/tree_flow_inputs.json - mv ./crates/committer_cli/benches/committer_flow_inputs.json_bu ./crates/committer_cli/benches/committer_flow_inputs.json -======= mv ./crates/committer_cli/test_inputs/tree_flow_inputs.json_bu ./crates/committer_cli/test_inputs/tree_flow_inputs.json mv ./crates/committer_cli/test_inputs/committer_flow_inputs.json_bu ./crates/committer_cli/test_inputs/committer_flow_inputs.json ->>>>>>> origin/main-v0.13.2 # Input files did change, download new inputs. - if: env.OLD_BENCH_INPUT_FILES_PREFIX != env.NEW_BENCH_INPUT_FILES_PREFIX diff --git a/crates/sequencing/papyrus_consensus/src/state_machine.rs b/crates/sequencing/papyrus_consensus/src/state_machine.rs index a934bce0e8..07627acbfe 100644 --- a/crates/sequencing/papyrus_consensus/src/state_machine.rs +++ b/crates/sequencing/papyrus_consensus/src/state_machine.rs @@ -17,42 +17,11 @@ use crate::types::{Round, ValidatorId}; /// Events which the state machine sends/receives. #[derive(Debug, Clone, PartialEq)] pub enum StateMachineEvent { -<<<<<<< HEAD /// Sent by the state machine when a block is required to propose (BlockHash is always None). /// While waiting for the response of GetProposal, the state machine will buffer all other /// events. The caller must respond with a valid block hash for this height to the state /// machine, and the same round sent out. GetProposal(Option, Round), -||||||| a9dc431b - /// StartRound is effective 2 questions: - /// 1. Is the local node the proposer for this round? - /// 2. If so, what value should be proposed? - /// While waiting for the response to this event, the state machine will buffer all other - /// events. - /// - /// How should the caller handle this event? - /// 1. If the local node is not the proposer, the caller responds with with `None` as the block - /// hash. - /// 2. If the local node is the proposer and a block hash was supplied by the state machine, - /// the caller responds with the supplied block hash. - /// 3. If the local node is the proposer and no block hash was supplied by the state machine, - /// the caller must find/build a block to respond with. - StartRound(Option, Round), -======= - /// StartRound is effective 2 questions: - /// 1. Is the local node the proposer for this round? - /// 2. If so, what value should be proposed? While waiting for the response to this event, the - /// state machine will buffer all other events. - /// - /// How should the caller handle this event? - /// 1. If the local node is not the proposer, the caller responds with with `None` as the block - /// hash. - /// 2. If the local node is the proposer and a block hash was supplied by the state machine, - /// the caller responds with the supplied block hash. - /// 3. If the local node is the proposer and no block hash was supplied by the state machine, - /// the caller must find/build a block to respond with. - StartRound(Option, Round), ->>>>>>> origin/main-v0.13.2 /// Consensus message, can be both sent from and to the state machine. Proposal(BlockHash, Round), /// Consensus message, can be both sent from and to the state machine.