Skip to content

refactor: use AgentEnvironment.get_network_descriptor() rather than creating a second one #2234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
May 26, 2022
Merged

refactor: use AgentEnvironment.get_network_descriptor() rather than creating a second one #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1777018
refactor: use AgentEnvironment.get_network_descriptor() rather than c…
May 25, 2022
ef7b2b9
clippy
May 26, 2022
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
8 changes: 4 additions & 4 deletions src/dfx/src/commands/identity/deploy_wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::lib::environment::Environment;
use crate::lib::error::DfxResult;
use crate::lib::identity::Identity;
use crate::lib::provider::{create_agent_environment, get_network_descriptor};
use crate::lib::provider::create_agent_environment;
use crate::lib::root_key::fetch_root_key_if_needed;

use anyhow::bail;
Expand All @@ -17,7 +17,7 @@ pub struct DeployWalletOpts {
}

pub fn exec(env: &dyn Environment, opts: DeployWalletOpts, network: Option<String>) -> DfxResult {
let agent_env = create_agent_environment(env, network.clone())?;
let agent_env = create_agent_environment(env, network)?;
let runtime = Runtime::new().expect("Unable to create a runtime");

runtime.block_on(async { fetch_root_key_if_needed(&agent_env).await })?;
Expand All @@ -26,13 +26,13 @@ pub fn exec(env: &dyn Environment, opts: DeployWalletOpts, network: Option<Strin
.get_selected_identity()
.expect("No selected identity.")
.to_string();
let network = get_network_descriptor(&agent_env, network)?;
let network = agent_env.get_network_descriptor();

let canister_id = opts.canister_id;
match CanisterId::from_text(&canister_id) {
Ok(id) => {
runtime.block_on(async {
Identity::create_wallet(&agent_env, &network, &identity_name, Some(id)).await?;
Identity::create_wallet(&agent_env, network, &identity_name, Some(id)).await?;
DfxResult::Ok(())
})?;
}
Expand Down
8 changes: 4 additions & 4 deletions src/dfx/src/commands/identity/get_wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::lib::environment::Environment;
use crate::lib::error::DfxResult;
use crate::lib::identity::Identity;
use crate::lib::provider::{create_agent_environment, get_network_descriptor};
use crate::lib::provider::create_agent_environment;
use crate::lib::root_key::fetch_root_key_if_needed;

use clap::Parser;
Expand All @@ -12,7 +12,7 @@ use tokio::runtime::Runtime;
pub struct GetWalletOpts {}

pub fn exec(env: &dyn Environment, _opts: GetWalletOpts, network: Option<String>) -> DfxResult {
let agent_env = create_agent_environment(env, network.clone())?;
let agent_env = create_agent_environment(env, network)?;
let runtime = Runtime::new().expect("Unable to create a runtime");

runtime.block_on(async { fetch_root_key_if_needed(&agent_env).await })?;
Expand All @@ -21,12 +21,12 @@ pub fn exec(env: &dyn Environment, _opts: GetWalletOpts, network: Option<String>
.get_selected_identity()
.expect("No selected identity.")
.to_string();
let network = get_network_descriptor(&agent_env, network)?;
let network = agent_env.get_network_descriptor();

runtime.block_on(async {
println!(
"{}",
Identity::get_or_create_wallet(&agent_env, &network, &identity_name, false).await?
Identity::get_or_create_wallet(&agent_env, network, &identity_name, false).await?
);
DfxResult::Ok(())
})?;
Expand Down
8 changes: 4 additions & 4 deletions src/dfx/src/commands/identity/set_wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::lib::environment::Environment;
use crate::lib::error::{DfxError, DfxResult};
use crate::lib::identity::Identity;
use crate::lib::models::canister_id_store::CanisterIdStore;
use crate::lib::provider::{create_agent_environment, get_network_descriptor};
use crate::lib::provider::create_agent_environment;

use anyhow::{anyhow, Context};
use clap::Parser;
Expand All @@ -24,7 +24,7 @@ pub struct SetWalletOpts {
}

pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>) -> DfxResult {
let agent_env = create_agent_environment(env, network.clone())?;
let agent_env = create_agent_environment(env, network)?;
let env = &agent_env;
let log = env.get_logger();

Expand All @@ -35,7 +35,7 @@ pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>)
.expect("No selected identity.")
.to_string();

let network = get_network_descriptor(&agent_env, network)?;
let network = agent_env.get_network_descriptor();

let canister_name = opts.canister_name.as_str();
let canister_id = match Principal::from_text(canister_name) {
Expand Down Expand Up @@ -100,7 +100,7 @@ pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>)
network.name,
canister_id
);
Identity::set_wallet_id(env, &network, &identity_name, canister_id)?;
Identity::set_wallet_id(env, network, &identity_name, canister_id)?;
info!(log, "Wallet set successfully.");

Ok(())
Expand Down