gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-15 02:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates syncing, corrects CLI variables

Browse Source
This commit is contained in:
Age Manning
2019-09-03 00:34:41 +10:00
parent c1614b110b
commit cd7b6da88e
6 changed files with 374 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_node/eth2-libp2p/src/discovery.rs
View File

@@ -341,13 +341,9 @@ fn save_enr_to_disc(dir: &Path, enr: &Enr, log: &slog::Logger) {
}
Err(e) => {
warn!(
log,
<<<<<<< HEAD
"Could not write ENR to file"; "file" => format!("{:?}{:?}",dir, ENR_FILENAME), "error" => format!("{}", e)
=======
"Could not write ENR to file"; "File" => format!("{:?}{:?}",dir, ENR_FILENAME), "Error" => format!("{}", e)
>>>>>>> interop
);
log,
"Could not write ENR to file"; "file" => format!("{:?}{:?}",dir, ENR_FILENAME), "error" => format!("{}", e)
);
}
}
}