Fix printing of subkey when using the --network override (#6932)

* Fix printing of subkey when using the `--network` override

This fixes a bug where `--network` did not printed the account ss58 address for the
requested network. Basically we now always print all account ss58 addresses using the
requested network.

* Review comments

* Fixes test

* Update client/cli/src/commands/inspect.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Update client/cli/src/commands/utils.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

* Fix more tests

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
This commit is contained in:
Bastian Köcher
2020-08-22 14:53:39 +02:00
committed by GitHub
parent 8ae1695526
commit e7f25ebda8
10 changed files with 80 additions and 78 deletions
@@ -44,9 +44,8 @@ pub struct ModuleIdCmd {
possible_values = &Ss58AddressFormat::all_names()[..],
parse(try_from_str = Ss58AddressFormat::try_from),
case_insensitive = true,
default_value = "substrate"
)]
pub network: Ss58AddressFormat,
pub network: Option<Ss58AddressFormat>,
#[allow(missing_docs)]
#[structopt(flatten)]
@@ -78,14 +77,13 @@ impl ModuleIdCmd {
.map_err(|_| "Cannot convert argument to moduleid: argument should be 8-character string")?;
let account_id: R::AccountId = ModuleId(id_fixed_array).into_account();
let network = self.network;
with_crypto_scheme!(
self.crypto_scheme.scheme,
print_from_uri(
&account_id.to_ss58check_with_version(network),
&account_id.to_ss58check_with_version(self.network.clone().unwrap_or_default()),
password,
network,
self.network,
self.output_scheme.output_type.clone()
)
);