pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 05:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/cli/src/lib.rs
+8 -6
View File
@@ -269,22 +269,24 @@ pub struct ParseAndPrepareRun<'a, RP> {
impl<'a, RP> ParseAndPrepareRun<'a, RP> {
/// Runs the command and runs the main client.
pub fn run<C, G, E, S, Exit, RS>(
pub fn run<C, G, CE, S, Exit, RS, E>(
self,
spec_factory: S,
exit: Exit,
run_service: RS,
) -> error::Result<()>
where S: FnOnce(&str) -> Result<Option<ChainSpec<G, E>>, String>,
where
S: FnOnce(&str) -> Result<Option<ChainSpec<G, CE>>, String>,
E: Into<error::Error>,
RP: StructOpt + Clone,
C: Default,
G: RuntimeGenesis,
E: ChainSpecExtension,
CE: ChainSpecExtension,
Exit: IntoExit,
RS: FnOnce(Exit, RunCmd, RP, Configuration<C, G, E>) -> Result<(), String>
RS: FnOnce(Exit, RunCmd, RP, Configuration<C, G, CE>) -> Result<(), E>
{
let config = create_run_node_config(
self.params.left.clone(), spec_factory, self.impl_name, self.version
self.params.left.clone(), spec_factory, self.impl_name, self.version,
)?;
run_service(exit, self.params.left, self.params.right, config).map_err(Into::into)
@@ -633,7 +635,7 @@ fn fill_config_keystore_password<C, G, E>(
}
fn create_run_node_config<C, G, E, S>(
cli: RunCmd, spec_factory: S, impl_name: &'static str, version: &VersionInfo
cli: RunCmd, spec_factory: S, impl_name: &'static str, version: &VersionInfo,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,