adjust a little

Author: programskillforverification

crates/forge/src/cmd/build.rs

@@ -1,6 +1,7 @@
-use super::{install, watch::WatchArgs};
+use super::watch::WatchArgs;
 use clap::Parser;
 use eyre::Result;
+use forge_verify::install_missing_dependencies;
 use foundry_cli::{opts::BuildOpts, utils::LoadConfig};
 use foundry_common::{compile::ProjectCompiler, shell};
 use foundry_compilers::{
@@ -69,7 +70,7 @@ impl BuildArgs {
     pub fn run(self) -> Result<ProjectCompileOutput> {
         let mut config = self.load_config()?;
 
-        if install::install_missing_dependencies(&mut config) && config.auto_detect_remappings {
+        if install_missing_dependencies(&mut config) && config.auto_detect_remappings {
             // need to re-configure here to also catch additional remappings
             config = self.load_config()?;
         }

crates/forge/src/cmd/clone.rs

@@ -1,7 +1,8 @@
-use super::{init::InitArgs, install::DependencyInstallOpts};
+use super::init::InitArgs;
 use alloy_primitives::{Address, Bytes, ChainId, TxHash};
 use clap::{Parser, ValueHint};
 use eyre::Result;
+use forge_verify::DependencyInstallOpts;
 use foundry_block_explorers::{
     contract::{ContractCreationData, ContractMetadata, Metadata},
     errors::EtherscanError,

crates/forge/src/cmd/coverage.rs

@@ -1,4 +1,4 @@
-use super::{install, test::TestArgs, watch::WatchArgs};
+use super::{test::TestArgs, watch::WatchArgs};
 use crate::{
     coverage::{
         analysis::{SourceAnalysis, SourceFile, SourceFiles},
@@ -12,6 +12,7 @@ use crate::{
 use alloy_primitives::{map::HashMap, Address, Bytes, U256};
 use clap::{Parser, ValueEnum, ValueHint};
 use eyre::{Context, Result};
+use forge_verify::install_missing_dependencies;
 use foundry_cli::utils::{LoadConfig, STATIC_FUZZ_SEED};
 use foundry_common::compile::ProjectCompiler;
 use foundry_compilers::{
@@ -88,7 +89,7 @@ impl CoverageArgs {
         let (mut config, evm_opts) = self.load_config_and_evm_opts()?;
 
         // install missing dependencies
-        if install::install_missing_dependencies(&mut config) && config.auto_detect_remappings {
+        if install_missing_dependencies(&mut config) && config.auto_detect_remappings {
             // need to re-configure here to also catch additional remappings
             config = self.load_config()?;
         }

crates/forge/src/cmd/create.rs

@@ -1,4 +1,3 @@
-use crate::cmd::install;
 use alloy_chains::Chain;
 use alloy_dyn_abi::{DynSolValue, JsonAbiExt, Specifier};
 use alloy_json_abi::{Constructor, JsonAbi};
@@ -11,7 +10,7 @@ use alloy_signer::Signer;
 use alloy_transport::TransportError;
 use clap::{Parser, ValueHint};
 use eyre::{Context, Result};
-use forge_verify::{RetryArgs, VerifierArgs, VerifyArgs};
+use forge_verify::{install_missing_dependencies, RetryArgs, VerifierArgs, VerifyArgs};
 use foundry_cli::{
     opts::{BuildOpts, EthereumOpts, EtherscanOpts, TransactionOpts},
     utils::{self, read_constructor_args_file, remove_contract, LoadConfig},
@@ -106,7 +105,7 @@ impl CreateArgs {
         let mut config = self.load_config()?;
 
         // Install missing dependencies.
-        if install::install_missing_dependencies(&mut config) && config.auto_detect_remappings {
+        if install_missing_dependencies(&mut config) && config.auto_detect_remappings {
             // need to re-configure here to also catch additional remappings
             config = self.load_config()?;
         }

crates/forge/src/cmd/init.rs

@@ -1,6 +1,6 @@
-use super::install::DependencyInstallOpts;
 use clap::{Parser, ValueHint};
 use eyre::Result;
+use forge_verify::DependencyInstallOpts;
 use foundry_cli::utils::Git;
 use foundry_common::fs;
 use foundry_compilers::artifacts::remappings::Remapping;