strip comments out from json for genesis_config.json, config.json, va…

…lidator_key.json and node_key.json

core/chain-configs/src/genesis_config.rs

@@ -272,7 +272,7 @@ impl GenesisConfig {
     pub fn from_file<P: AsRef<Path>>(path: P) -> anyhow::Result<Self> {
         let file = File::open(path).with_context(|| "Could not open genesis config file.")?;
         let reader = BufReader::new(file);
-        // Strip the comments from the input (use `as_bytes()` to get a `Read`).
+        // Strip the comments from the input
         let stripped = StripComments::new(reader);
         let genesis_config: GenesisConfig = serde_json::from_reader(stripped)
             .with_context(|| "Failed to deserialize the genesis records.")?;

core/crypto/Cargo.toml

@@ -18,6 +18,7 @@ c2-chacha.workspace = true
 curve25519-dalek.workspace = true
 derive_more.workspace = true
 ed25519-dalek.workspace = true
+json_comments.workspace = true
 near-account-id = { path = "../account-id" }
 once_cell.workspace = true
 primitive-types.workspace = true

core/crypto/src/key_file.rs

@@ -1,8 +1,9 @@
 use std::fs::File;
 use std::io;
-use std::io::Write;
+use std::io::{Read, Write};
 use std::path::Path;
 
+use json_comments::StripComments;
 use serde::{Deserialize, Serialize};
 
 use crate::{PublicKey, SecretKey};
@@ -40,7 +41,10 @@ impl KeyFile {
 
     pub fn from_file(path: &Path) -> io::Result<Self> {
         let content = std::fs::read_to_string(path)?;
-        Ok(serde_json::from_str(&content)?)
+        let mut content_without_comments = String::new();
+        StripComments::new(content.as_bytes()).read_to_string(&mut content_without_comments)?;
+
+        Ok(serde_json::from_str(&content_without_comments)?)
     }
 }
 

nearcore/src/config.rs

@@ -399,8 +399,7 @@ impl Config {
         let contents = std::fs::read_to_string(path)
             .with_context(|| format!("Failed to read config from {}", path.display()))?;
         let mut unrecognised_fields = Vec::new();
-        let mut contents_without_comments = String::new();
-        StripComments::new(contents.as_bytes()).read_to_string(&mut contents_without_comments).unwrap();
+        let contents_without_comments = strip_comments_from_str(&contents)?;
         let config: Config = serde_ignored::deserialize(
             &mut serde_json::Deserializer::from_str(&contents_without_comments),
             |field| {
@@ -1304,7 +1303,10 @@ impl NodeKeyFile {
         let mut file = File::open(path)?;
         let mut content = String::new();
         file.read_to_string(&mut content)?;
-        Ok(serde_json::from_str(&content)?)
+
+        let content_without_comments = strip_comments_from_str(&content)?;
+
+        Ok(serde_json::from_str(&content_without_comments)?)
     }
 }
 
@@ -1324,6 +1326,12 @@ impl From<NodeKeyFile> for KeyFile {
     }
 }
 
+fn strip_comments_from_str(input: &String) -> std::io::Result<String> {
+    let mut content_without_comments = String::new();
+    StripComments::new(input.as_bytes()).read_to_string(&mut content_without_comments)?;
+    Ok(content_without_comments)
+}
+
 pub fn load_config(
     dir: &Path,
     genesis_validation: GenesisValidationMode,

nearcore/src/dyn_config.rs

@@ -61,7 +61,7 @@ where
 {
     match std::fs::read_to_string(path) {
         Ok(config_str) => {
-            // Strip the comments from the input (use `as_bytes()` to get a `Read`).
+            // Strip the comments from the input
             let stripped = StripComments::new(config_str.as_bytes());
 
             match serde_json::from_reader(stripped) {