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

starkware-libs · Dec 2, 2024 · d487cb5 · d487cb5
1 parent 26bd6aa
commit d487cb5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/crates/papyrus_node/src/run.rs b/crates/papyrus_node/src/run.rs
@@ -51,7 +51,10 @@ const DEFAULT_LEVEL: LevelFilter = LevelFilter::INFO;
 // different genesis hash.
 // TODO: Consider moving to a more general place.
 const GENESIS_HASH: &str = "0x0";
+<<<<<<< HEAD
 // TODO(guyn): move this to the config.
+=======
+>>>>>>> 93fd11f32 (feat: allow a streamed proposal channel on top of existing one)
 pub const NETWORK_TOPIC: &str = "consensus_proposals";
 
 // TODO(dvir): add this to config.

diff --git a/crates/papyrus_protobuf/src/converters/mod.rs b/crates/papyrus_protobuf/src/converters/mod.rs
@@ -27,6 +27,10 @@ pub enum ProtobufConversionError {
         type_description: &'static str,
         value_as_str: String,
         expected: &'static str,
+<<<<<<< HEAD
+=======
+        got: &'static str,
+>>>>>>> 93fd11f32 (feat: allow a streamed proposal channel on top of existing one)
     },
     #[error(transparent)]
     DecodeError(#[from] DecodeError),