import things

Author: adamspofford-dfinity

bin/icp-cli/src/commands/identity/default.rs

@@ -1,5 +1,6 @@
 use crate::env::Env;
 use clap::Parser;
+use icp_identity::manifest::{change_default_identity, load_identity_defaults, load_identity_list};
 use snafu::Snafu;
 
 #[derive(Debug, Parser)]
@@ -8,12 +9,13 @@ pub struct DefaultCmd {
 }
 
 pub fn exec(env: &Env, cmd: DefaultCmd) -> Result<(), DefaultIdentityError> {
+    let dirs = env.dirs();
     if let Some(name) = cmd.name {
-        let list = icp_identity::manifest::load_identity_list(env.dirs())?;
-        icp_identity::manifest::change_default_identity(env.dirs(), &list, &name)?;
+        let list = load_identity_list(dirs)?;
+        change_default_identity(dirs, &list, &name)?;
         println!("Set default identity to {name}");
     } else {
-        let defaults = icp_identity::manifest::load_identity_defaults(env.dirs())?;
+        let defaults = load_identity_defaults(dirs)?;
         println!("{}", defaults.default);
     }
     Ok(())

bin/icp-cli/src/commands/identity/import.rs

@@ -6,8 +6,9 @@ use dialoguer::Password;
 use icp_fs::fs;
 use icp_identity::{
     CreateIdentityError,
-    key::{CreateFormat, IdentityKey},
+    key::{CreateFormat, IdentityKey, create_identity},
     manifest::IdentityKeyAlgorithm,
+    seed::derive_default_key_from_seed,
 };
 use itertools::Itertools;
 use k256::{Secp256k1, SecretKey};
@@ -122,7 +123,7 @@ fn import_from_pem(
         )?,
         _ => unreachable!(),
     };
-    icp_identity::key::create_identity(env.dirs(), name, key, CreateFormat::Plaintext)?;
+    create_identity(env.dirs(), name, key, CreateFormat::Plaintext)?;
     Ok(())
 }
 
@@ -246,8 +247,8 @@ fn import_sec1(
 
 fn import_from_seed_phrase(env: &Env, name: &str, phrase: &str) -> Result<(), DeriveKeyError> {
     let mnemonic = Mnemonic::from_phrase(phrase, Language::English).context(ParseMnemonicSnafu)?;
-    let key = icp_identity::seed::derive_default_key_from_seed(&mnemonic);
-    icp_identity::key::create_identity(
+    let key = derive_default_key_from_seed(&mnemonic);
+    create_identity(
         env.dirs(),
         name,
         IdentityKey::Secp256k1(key),

bin/icp-cli/src/commands/identity/list.rs

@@ -1,13 +1,15 @@
 use crate::env::Env;
 use clap::Parser;
+use icp_identity::manifest::{load_identity_defaults, load_identity_list};
 use snafu::Snafu;
 
 #[derive(Debug, Parser)]
 pub struct ListCmd;
 
 pub fn exec(env: &Env, _cmd: ListCmd) -> Result<(), ListKeysError> {
-    let list = icp_identity::manifest::load_identity_list(env.dirs())?;
-    let defaults = icp_identity::manifest::load_identity_defaults(env.dirs())?;
+    let dirs = env.dirs();
+    let list = load_identity_list(dirs)?;
+    let defaults = load_identity_defaults(dirs)?;
     for id in list.identities.keys() {
         if *id == defaults.default {
             println!("* {id}");

bin/icp-cli/src/commands/identity/new.rs

@@ -5,7 +5,8 @@ use clap::Parser;
 use icp_fs::fs;
 use icp_identity::{
     CreateIdentityError,
-    key::{CreateFormat, IdentityKey},
+    key::{CreateFormat, IdentityKey, create_identity},
+    seed::derive_default_key_from_seed,
 };
 use snafu::Snafu;
 
@@ -18,8 +19,8 @@ pub struct NewCmd {
 
 pub fn exec(env: &Env, cmd: NewCmd) -> Result<(), NewIdentityError> {
     let mnemonic = Mnemonic::new(MnemonicType::for_key_size(256).unwrap(), Language::English);
-    let key = icp_identity::seed::derive_default_key_from_seed(&mnemonic);
-    icp_identity::key::create_identity(
+    let key = derive_default_key_from_seed(&mnemonic);
+    create_identity(
         env.dirs(),
         &cmd.name,
         IdentityKey::Secp256k1(key),