Throw an error if a bootnode is registered with two different peer ids (#3891)

* Throw an error if a bootnode is registered with two different peer ids

* Rename error

* Fix compilation :(

* Review feedback
This commit is contained in:
Bastian Köcher
2019-10-23 17:17:12 +02:00
committed by GitHub
parent 968b24d849
commit d82216673c
7 changed files with 73 additions and 34 deletions
+3 -3
View File
@@ -29,15 +29,15 @@ pub fn run<I, T, E>(args: I, exit: E, version: VersionInfo) -> error::Result<()>
match config.roles {
ServiceRoles::LIGHT => run_until_exit(
runtime,
service::new_light(config).map_err(|e| format!("{:?}", e))?,
service::new_light(config)?,
exit
),
_ => run_until_exit(
runtime,
service::new_full(config).map_err(|e| format!("{:?}", e))?,
service::new_full(config)?,
exit
),
}.map_err(|e| format!("{:?}", e))
}
}),
ParseAndPrepare::BuildSpec(cmd) => cmd.run(load_spec),
ParseAndPrepare::ExportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>|
+2 -5
View File
@@ -10,7 +10,7 @@ mod cli;
pub use substrate_cli::{VersionInfo, IntoExit, error};
fn main() {
fn main() -> Result<(), cli::error::Error> {
let version = VersionInfo {
name: "Substrate Node",
commit: env!("VERGEN_SHA_SHORT"),
@@ -21,8 +21,5 @@ fn main() {
support_url: "support.anonymous.an",
};
if let Err(e) = cli::run(::std::env::args(), cli::Exit, version) {
eprintln!("Fatal error: {}\n\n{:?}", e, e);
std::process::exit(1)
}
cli::run(std::env::args(), cli::Exit, version)
}