[Stability] Config file changes

crates/orchestrator/src/config.rs

@@ -66,11 +66,13 @@ pub enum NetworkConfigError {
     #[error("Failed to read NetworkConfig from file")]
     ReadFromFileError(std::io::Error),
     #[error("Failed to deserialize loaded NetworkConfig")]
-    DeserializeError(bincode::Error),
+    DeserializeError(serde_json::Error),
     #[error("Failed to write NetworkConfig to file")]
     WriteToFileError(std::io::Error),
     #[error("Failed to serialize NetworkConfig")]
-    SerializeError(bincode::Error),
+    SerializeError(serde_json::Error),
+    #[error("Failed to recursively create path to NetworkConfig")]
+    FailedToCreatePath(std::io::Error),
 }
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
@@ -144,13 +146,6 @@ impl<K: SignatureKey, E: ElectionConfig> NetworkConfig<K, E> {
                     let config = client.get_config(client.identity.clone()).await;
 
                     // save to file if we fell back
-                    // ensure the directory containing the config file exists
-                    if let Some(dir) = Path::new(&file).parent() {
-                        if let Err(e) = fs::create_dir_all(dir) {
-                            error!("Failed to recursively create path to config file: {e}")
-                        }
-                    }
-
                     if let Err(e) = config.to_file(file) {
                         error!("{e}");
                     };
@@ -201,15 +196,15 @@ impl<K: SignatureKey, E: ElectionConfig> NetworkConfig<K, E> {
         };
 
         // deserialize
-        match bincode::deserialize(&data) {
+        match serde_json::from_slice(&data) {
             Ok(data) => Ok(data),
             Err(e) => Err(NetworkConfigError::DeserializeError(e)),
         }
     }
 
     /// Serializes the `NetworkConfig` and writes it to a file.
     ///
-    /// This function takes a file path as a string, serializes the `NetworkConfig` into binary format using `bincode`, and then writes the serialized data to the file.
+    /// This function takes a file path as a string, serializes the `NetworkConfig` into JSON format using `serde_json` and then writes the serialized data to the file.
     ///
     /// # Arguments
     ///
@@ -231,8 +226,15 @@ impl<K: SignatureKey, E: ElectionConfig> NetworkConfig<K, E> {
     /// config.to_file(file).unwrap();
     /// ```
     pub fn to_file(&self, file: String) -> Result<(), NetworkConfigError> {
+        // ensure the directory containing the config file exists
+        if let Some(dir) = Path::new(&file).parent() {
+            if let Err(e) = fs::create_dir_all(dir) {
+                return Err(NetworkConfigError::FailedToCreatePath(e));
+            }
+        }
+
         // serialize
-        let serialized = match bincode::serialize(self) {
+        let serialized = match serde_json::to_string_pretty(self) {
             Ok(data) => data,
             Err(e) => {
                 return Err(NetworkConfigError::SerializeError(e));

crates/task-impls/src/consensus.rs

@@ -997,7 +997,8 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, A: ConsensusApi<TYPES, I> +
                 let high_qc = self.consensus.read().await.high_qc.clone();
                 let leader_view = high_qc.get_view_number() + 1;
                 if self.quorum_membership.get_leader(leader_view) == self.public_key {
-                    self.publish_proposal_if_able(high_qc, leader_view, None).await;
+                    self.publish_proposal_if_able(high_qc, leader_view, None)
+                        .await;
                 }
             }
             _ => {}