Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Update impl SubstrateCli #1333

Closed
wants to merge 4 commits into from
Closed

Update impl SubstrateCli #1333

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6368b5
Update impl SubstrateCli
Jul 1, 2020
47bda75
Use .into() instead of String::from
Jul 1, 2020
543fc44
Use default impl for executable_name()
Jul 1, 2020
da70586
Merge branch 'master' of github.com:paritytech/polkadot into scott_re…
Jul 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,18 @@ fn get_exec_name() -> Option<String> {
}

impl SubstrateCli for Cli {
fn impl_name() -> &'static str { "Parity Polkadot" }
fn impl_name() -> String { "Parity Polkadot".into() }

fn impl_version() -> &'static str { env!("SUBSTRATE_CLI_IMPL_VERSION") }
fn impl_version() -> String { env!("SUBSTRATE_CLI_IMPL_VERSION").into() }

fn description() -> &'static str { env!("CARGO_PKG_DESCRIPTION") }
fn description() -> String { env!("CARGO_PKG_DESCRIPTION").into() }

fn author() -> &'static str { env!("CARGO_PKG_AUTHORS") }
fn author() -> String { env!("CARGO_PKG_AUTHORS").into() }

fn support_url() -> &'static str { "https://github.com/paritytech/polkadot/issues/new" }
fn support_url() -> String { "https://github.com/paritytech/polkadot/issues/new".into() }

fn copyright_start_year() -> i32 { 2017 }

fn executable_name() -> &'static str { "polkadot" }

fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
let id = if id == "" {
let n = get_exec_name().unwrap_or_default();
Expand Down