fix(papyrus_network): remove quic_port from NetworkConfig (#2623)

starkware-libs · Dec 26, 2024 · 5895682 · 5895682
1 parent 29d16de
commit 5895682
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 59 deletions.
diff --git a/config/papyrus/default_config.json b/config/papyrus/default_config.json
@@ -149,11 +149,6 @@
     "privacy": "Public",
     "value": 1000
   },
-  "consensus.network_config.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "privacy": "Public",
-    "value": 10101
-  },
   "consensus.network_config.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "privacy": "Private",
@@ -299,11 +294,6 @@
     "privacy": "Public",
     "value": 1000
   },
-  "network.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "privacy": "Public",
-    "value": 10001
-  },
   "network.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "privacy": "Private",

diff --git a/config/sequencer/default_config.json b/config/sequencer/default_config.json
@@ -679,11 +679,6 @@
     "privacy": "Public",
     "value": 1000
   },
-  "consensus_manager_config.consensus_config.network_config.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "privacy": "Public",
-    "value": 10101
-  },
   "consensus_manager_config.consensus_config.network_config.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "privacy": "Private",
@@ -919,11 +914,6 @@
     "privacy": "Public",
     "value": 1000
   },
-  "mempool_p2p_config.network_config.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "privacy": "Public",
-    "value": 10001
-  },
   "mempool_p2p_config.network_config.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "privacy": "Private",
@@ -1024,11 +1014,6 @@
     "privacy": "Public",
     "value": 1000
   },
-  "state_sync_config.network_config.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "privacy": "Public",
-    "value": 10001
-  },
   "state_sync_config.network_config.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "privacy": "Private",

diff --git a/crates/papyrus_network/src/lib.rs b/crates/papyrus_network/src/lib.rs
@@ -42,7 +42,6 @@ use validator::Validate;
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Validate)]
 pub struct NetworkConfig {
     pub tcp_port: u16,
-    pub quic_port: u16,
     #[serde(deserialize_with = "deserialize_seconds_to_duration")]
     pub session_timeout: Duration,
     #[serde(deserialize_with = "deserialize_seconds_to_duration")]
@@ -66,12 +65,6 @@ impl SerializeConfig for NetworkConfig {
                 "The port that the node listens on for incoming tcp connections.",
                 ParamPrivacyInput::Public,
             ),
-            ser_param(
-                "quic_port",
-                &self.quic_port,
-                "The port that the node listens on for incoming quic connections.",
-                ParamPrivacyInput::Public,
-            ),
             ser_param(
                 "session_timeout",
                 &self.session_timeout.as_secs(),
@@ -126,7 +119,6 @@ impl Default for NetworkConfig {
     fn default() -> Self {
         Self {
             tcp_port: 10000,
-            quic_port: 10001,
             session_timeout: Duration::from_secs(120),
             idle_connection_timeout: Duration::from_secs(120),
             bootstrap_peer_multiaddr: None,

diff --git a/crates/papyrus_network/src/network_manager/mod.rs b/crates/papyrus_network/src/network_manager/mod.rs
@@ -624,7 +624,6 @@ impl NetworkManager {
     pub fn new(config: NetworkConfig, node_version: Option<String>) -> Self {
         let NetworkConfig {
             tcp_port,
-            quic_port: _,
             session_timeout,
             idle_connection_timeout,
             bootstrap_peer_multiaddr,
@@ -635,11 +634,8 @@ impl NetworkManager {
             peer_manager_config,
         } = config;
 
-        let listen_addresses = vec![
-            // TODO: uncomment once quic transpot works.
-            // format!("/ip4/0.0.0.0/udp/{quic_port}/quic-v1"),
-            format!("/ip4/0.0.0.0/tcp/{tcp_port}"),
-        ];
+        // TODO(shahak): Add quic transport.
+        let listen_addresses = vec![format!("/ip4/0.0.0.0/tcp/{tcp_port}")];
 
         let swarm = build_swarm(listen_addresses, idle_connection_timeout, secret_key, |key| {
             mixed_behaviour::MixedBehaviour::new(

diff --git a/...rus_node/src/config/snapshots/papyrus_node__config__config_test__dump_default_config.snap b/...rus_node/src/config/snapshots/papyrus_node__config__config_test__dump_default_config.snap
@@ -175,13 +175,6 @@ expression: dumped_default_config
     },
     "privacy": "Public"
   },
-  "consensus.network_config.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "value": {
-      "$serde_json::private::Number": "10101"
-    },
-    "privacy": "Public"
-  },
   "consensus.network_config.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "value": "",
@@ -357,13 +350,6 @@ expression: dumped_default_config
     },
     "privacy": "Public"
   },
-  "network.quic_port": {
-    "description": "The port that the node listens on for incoming quic connections.",
-    "value": {
-      "$serde_json::private::Number": "10001"
-    },
-    "privacy": "Public"
-  },
   "network.secret_key": {
     "description": "The secret key used for building the peer id. If it's an empty string a random one will be used.",
     "value": "",

diff --git a/crates/sequencing/papyrus_consensus/src/config.rs b/crates/sequencing/papyrus_consensus/src/config.rs
@@ -21,7 +21,6 @@ use validator::Validate;
 use crate::types::ValidatorId;
 
 const CONSENSUS_TCP_PORT: u16 = 10100;
-const CONSENSUS_QUIC_PORT: u16 = 10101;
 
 /// Configuration for consensus.
 #[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Validate)]
@@ -104,11 +103,7 @@ impl SerializeConfig for ConsensusConfig {
 
 impl Default for ConsensusConfig {
     fn default() -> Self {
-        let network_config = NetworkConfig {
-            tcp_port: CONSENSUS_TCP_PORT,
-            quic_port: CONSENSUS_QUIC_PORT,
-            ..Default::default()
-        };
+        let network_config = NetworkConfig { tcp_port: CONSENSUS_TCP_PORT, ..Default::default() };
         Self {
             chain_id: ChainId::Other("0x0".to_string()),
             validator_id: ValidatorId::from(DEFAULT_VALIDATOR_ID),