Merge branch 'main' into romac/floodsub

informalsystems · Sep 6, 2024 · 23dd4c9 · 23dd4c9
2 parents 8c079f8 + 6cb9578
commit 23dd4c9
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 40 deletions.
diff --git a/code/Cargo.lock b/code/Cargo.lock
diff --git a/code/Cargo.toml b/code/Cargo.toml
@@ -66,7 +66,7 @@ starknet-core   = "0.11.1"
 starknet-crypto = "0.7.1"
 
 async-recursion    = "1.1"
-async-trait        = "0.1.77"
+async-trait        = "0.1.82"
 axum               = "0.7"
 base64             = "0.22.0"
 bytesize           = "1.3"
@@ -109,7 +109,7 @@ sha3               = "0.10"
 signature          = "2.2.0"
 tempfile           = "3.12.0"
 thiserror          = "1.0"
-tokio              = "1.39.3"
+tokio              = "1.40.0"
 tokio-stream       = "0.1"
 toml               = "0.8.19"
 tracing            = "0.1.40"

diff --git a/code/config.toml b/code/config.toml
@@ -97,15 +97,6 @@ max_tx_count = 10000
 # Override with MALACHITE__MEMPOOL__GOSSIP_BATCH_SIZE
 gossip_batch_size = 100
 
-# The type of pub-sub protocol to use for the mempool
-# !!! Does not have any effect yet !!!
-#
-# Possible values:
-# - "gossipsub": Use the GossipSub v1.1 protocol (gossip, recommended)
-# - "floodsub": Use the FloodSub protocol (no gossip, experimental)
-# Override with MALACHITE__MEMPOOL__P2P__PROTOCOL env variable
-protocol = "gossipsub"
-
 #######################################################
 ###       Mempool P2P Configuration Options       ###
 #######################################################
@@ -117,6 +108,15 @@ listen_addr = "/ip4/0.0.0.0/udp/0/quic-v1"
 # List of nodes to keep persistent connections to
 persistent_peers = []
 
+# The type of pub-sub protocol to use for the mempool
+# !!! Does not have any effect yet !!!
+#
+# Possible values:
+# - "gossipsub": Use the GossipSub v1.1 protocol (gossip, recommended)
+# - "floodsub": Use the FloodSub protocol (no gossip, experimental)
+# Override with MALACHITE__MEMPOOL__P2P__PROTOCOL env variable
+protocol = "gossipsub"
+
 #######################################################
 ###          Metrics Configuration Options          ###
 #######################################################

diff --git a/code/crates/actors/src/host.rs b/code/crates/actors/src/host.rs
@@ -56,13 +56,6 @@ pub enum HostMsg<Ctx: Context> {
         reply_to: RpcReplyPort<ProposedValue<Ctx>>,
     },
 
-    /// Retrieve a block/value for which all parts have been received
-    GetReceivedValue {
-        height: Ctx::Height,
-        round: Round,
-        reply_to: RpcReplyPort<Option<ProposedValue<Ctx>>>,
-    },
-
     /// Get the validator set at a given height
     GetValidatorSet {
         height: Ctx::Height,

diff --git a/code/crates/starknet/host/src/actor.rs b/code/crates/starknet/host/src/actor.rs
@@ -331,18 +331,6 @@ impl Actor for StarknetHost {
                 Ok(())
             }
 
-            HostMsg::GetReceivedValue {
-                height,
-                round,
-                reply_to,
-            } => {
-                let proposal_parts = state.part_store.all_parts(height, round);
-                let proposed_value = self.build_value_from_parts(&proposal_parts, height, round);
-                reply_to.send(proposed_value)?;
-
-                Ok(())
-            }
-
             HostMsg::GetValidatorSet { height, reply_to } => {
                 if let Some(validators) = self.host.validators(height).await {
                     reply_to.send(ValidatorSet::new(validators))?;