From a88c4af88b703156eb42ccea0e0894f1035cbdb8 Mon Sep 17 00:00:00 2001 From: Simon Littlejohns <39836665+simonljs@users.noreply.github.com> Date: Fri, 3 Aug 2018 15:21:57 +0100 Subject: [PATCH 1/6] Update lib.rs --- substrate/cli/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs index d3512a415f1e9..1d1cbd636464d 100644 --- a/substrate/cli/src/lib.rs +++ b/substrate/cli/src/lib.rs @@ -163,8 +163,7 @@ where { panic_hook::set(); - let full_version = service::Configuration::<::Configuration, ::Genesis> - ::full_version_from_strs(version.version, version.commit); + let full_version = service::config::full_version_from_strs(version.version, version.commit); let yaml = format!(include_str!("./cli.yml"), name = version.executable_name, From 799a9382e0d708f459103436226c45c4795f9353 Mon Sep 17 00:00:00 2001 From: Simon Littlejohns <39836665+simonljs@users.noreply.github.com> Date: Fri, 3 Aug 2018 15:24:07 +0100 Subject: [PATCH 2/6] Update lib.rs --- substrate/service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/service/src/lib.rs b/substrate/service/src/lib.rs index d906bae088e8d..e2fd22803bce8 100644 --- a/substrate/service/src/lib.rs +++ b/substrate/service/src/lib.rs @@ -50,7 +50,7 @@ extern crate serde_derive; mod components; mod error; -mod config; +pub mod config; mod chain_spec; pub mod chain_ops; From 3a35b9a742a7a91928bec8835c205f974442f180 Mon Sep 17 00:00:00 2001 From: Simon Littlejohns <39836665+simonljs@users.noreply.github.com> Date: Fri, 3 Aug 2018 15:29:05 +0100 Subject: [PATCH 3/6] Update config.rs --- substrate/service/src/config.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/substrate/service/src/config.rs b/substrate/service/src/config.rs index 7a5696bc261e4..9a9b098d3c805 100644 --- a/substrate/service/src/config.rs +++ b/substrate/service/src/config.rs @@ -98,22 +98,9 @@ impl Configuration String { - let env = Target::env(); - let env_dash = if env.is_empty() { "" } else { "-" }; - format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env) - } - /// Returns full version string of this configuration. pub fn full_version(&self) -> String { - Self::full_version_from_strs(self.impl_version, self.impl_commit) - } - - /// Returns full version string, using supplied version and commit. - pub fn full_version_from_strs(impl_version: &str, impl_commit: &str) -> String { - let commit_dash = if impl_commit.is_empty() { "" } else { "-" }; - format!("{}{}{}-{}", impl_version, commit_dash, impl_commit, Self::platform()) + full_version_from_strs(self.impl_version, self.impl_commit) } /// Implementation id and version. @@ -121,3 +108,16 @@ impl Configuration String { + let env = Target::env(); + let env_dash = if env.is_empty() { "" } else { "-" }; + format!("{}-{}{}{}", Target::arch(), Target::os(), env_dash, env) +} + +/// Returns full version string, using supplied version and commit. +pub fn full_version_from_strs(impl_version: &str, impl_commit: &str) -> String { + let commit_dash = if impl_commit.is_empty() { "" } else { "-" }; + format!("{}{}{}-{}", impl_version, commit_dash, impl_commit, platform()) +} From 928d289ceb7a63ec4fb8bea79964120be36fb1ed Mon Sep 17 00:00:00 2001 From: Simon Littlejohns <39836665+simonljs@users.noreply.github.com> Date: Fri, 3 Aug 2018 16:07:00 +0100 Subject: [PATCH 4/6] Update lib.rs --- substrate/cli/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs index 1d1cbd636464d..a014189197020 100644 --- a/substrate/cli/src/lib.rs +++ b/substrate/cli/src/lib.rs @@ -163,8 +163,10 @@ where { panic_hook::set(); - let full_version = service::config::full_version_from_strs(version.version, version.commit); - + let full_version = service::config::full_version_from_strs( + version.version, + version.commit + ); let yaml = format!(include_str!("./cli.yml"), name = version.executable_name, description = version.description, From 12331f081eb3e92ec5406e18a9cd836fd4c7eb95 Mon Sep 17 00:00:00 2001 From: Simon Littlejohns <39836665+simonljs@users.noreply.github.com> Date: Fri, 3 Aug 2018 18:35:40 +0100 Subject: [PATCH 5/6] Update lib.rs --- substrate/service/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substrate/service/src/lib.rs b/substrate/service/src/lib.rs index e2fd22803bce8..711bd87548361 100644 --- a/substrate/service/src/lib.rs +++ b/substrate/service/src/lib.rs @@ -50,8 +50,8 @@ extern crate serde_derive; mod components; mod error; -pub mod config; mod chain_spec; +pub mod config; pub mod chain_ops; use std::io; From 968c0d218224d8876bb256729473e6d4710543aa Mon Sep 17 00:00:00 2001 From: simonljs <-> Date: Fri, 3 Aug 2018 19:32:33 +0100 Subject: [PATCH 6/6] tab correction --- substrate/service/src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/substrate/service/src/config.rs b/substrate/service/src/config.rs index 9a9b098d3c805..465d7851c6468 100644 --- a/substrate/service/src/config.rs +++ b/substrate/service/src/config.rs @@ -121,3 +121,4 @@ pub fn full_version_from_strs(impl_version: &str, impl_commit: &str) -> String { let commit_dash = if impl_commit.is_empty() { "" } else { "-" }; format!("{}{}{}-{}", impl_version, commit_dash, impl_commit, platform()) } +