fix: merge.

movementlabsxyz · Apr 19, 2024 · bada906 · bada906
2 parents 8f40ae4 + dfe3407
commit bada906
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/aptos-node/src/lib.rs b/aptos-node/src/lib.rs
@@ -6,10 +6,10 @@
 
 mod indexer;
 mod logger;
-mod network;
+pub mod network;
 mod services;
 mod state_sync;
-mod storage;
+pub mod storage;
 pub mod utils;
 
 #[cfg(test)]

diff --git a/config/src/config/identity_config.rs b/config/src/config/identity_config.rs
@@ -38,7 +38,15 @@ pub struct IdentityBlob {
 
 impl IdentityBlob {
     pub fn from_file(path: &Path) -> anyhow::Result<IdentityBlob> {
-        Ok(serde_yaml::from_str(&fs::read_to_string(path)?)?)
+        let content = fs::read_to_string(path)?;
+        match serde_yaml::from_str(&content) {
+            Ok(identity_blob) => Ok(identity_blob),
+            Err(e) => {
+                eprintln!("Deserialization error: {:?}", e);
+                eprintln!("YAML content:\n{}", content);
+                Err(e.into())
+            },
+        }
     }
 
     pub fn to_file(&self, path: &Path) -> anyhow::Result<()> {

diff --git a/mempool/src/lib.rs b/mempool/src/lib.rs
@@ -69,7 +69,7 @@ pub use shared_mempool::{
 #[cfg(any(test, feature = "fuzzing"))]
 pub use tests::{fuzzing, mocks};
 
-mod core_mempool;
+pub mod core_mempool;
 pub mod counters;
 mod logging;
 mod shared_mempool;