fix(forge): same way to flatten for all commands

Author: grandizzy

crates/verify/src/etherscan/flatten.rs

@@ -1,6 +1,6 @@
 use super::{EtherscanSourceProvider, VerifyArgs};
 use crate::provider::VerificationContext;
-use eyre::{Context, Result};
+use eyre::Result;
 use foundry_block_explorers::verify::CodeFormat;
 use foundry_compilers::{
     AggregatedCompilerOutput,
@@ -10,6 +10,7 @@ use foundry_compilers::{
         Compiler, CompilerInput,
         solc::{SolcCompiler, SolcLanguage, SolcVersionedInput},
     },
+    flatten::Flattener,
     solc::Solc,
 };
 use semver::{BuildMetadata, Version};
@@ -32,18 +33,18 @@ impl EtherscanSourceProvider for EtherscanFlattenedSource {
             bch,
         );
 
-        let source = context
-            .project
-            .paths
-            .clone()
-            .with_language::<SolcLanguage>()
-            .flatten(&context.target_path)
-            .wrap_err("Failed to flatten contract")?;
+        let flattener = Flattener::new(context.project.clone(), &context.target_path)
+            .map_err(|err| eyre::eyre!("Failed to flatten: {err}"))?;
+        let flattened = flattener.flatten();
 
         if !args.force {
             // solc dry run of flattened code
-            self.check_flattened(source.clone(), &context.compiler_version, &context.target_path)
-                .map_err(|err| {
+            self.check_flattened(
+                flattened.clone(),
+                &context.compiler_version,
+                &context.target_path,
+            )
+            .map_err(|err| {
                 eyre::eyre!(
                     "Failed to compile the flattened code locally: `{}`\
             To skip this solc dry, have a look at the `--force` flag of this command.",
@@ -52,7 +53,7 @@ impl EtherscanSourceProvider for EtherscanFlattenedSource {
             })?;
         }
 
-        Ok((source, context.target_name.clone(), CodeFormat::SingleFile))
+        Ok((flattened, context.target_name.clone(), CodeFormat::SingleFile))
     }
 }