refactor(forge): address review comments on verify-bytecode no-explorer PR

Author: PrazwalR

crates/verify/src/bytecode.rs

@@ -287,7 +287,7 @@ impl VerifyBytecodeArgs {
         };
 
         // Obtain Etherscan compilation metadata.
-        let etherscan_metadata = source_code.as_ref().map(|source| source.items.first().unwrap());
+        let etherscan_metadata = source_code.as_ref().and_then(|source| source.items.first());
 
         // The EVM version to verify against: the explorer-reported version when available,
         // otherwise the local project configuration.
@@ -321,7 +321,7 @@ impl VerifyBytecodeArgs {
             provided.into()
         } else if let Some(source_code) = &source_code {
             // If no constructor args were provided, try to retrieve them from the explorer.
-            check_explorer_args(source_code.clone())?
+            check_explorer_args(source_code)?
         } else {
             Bytes::new()
         };
@@ -369,7 +369,7 @@ impl VerifyBytecodeArgs {
             .await?;
 
             evm_env.block_env.set_number(U256::from(deploy_block));
-            let genesis_block = provider.get_block(deploy_block.into()).full().await?;
+            let deploy_block_info = provider.get_block(deploy_block.into()).full().await?;
 
             // Setup genesis tx_env and evm_evm.
             let deployer = Address::with_last_byte(0x1);
@@ -381,7 +381,7 @@ impl VerifyBytecodeArgs {
             tx_env.set_gas_limit(evm_env.block_env.gas_limit());
             tx_env.set_gas_price(evm_env.block_env.basefee() as u128);
 
-            if let Some(ref block) = genesis_block {
+            if let Some(ref block) = deploy_block_info {
                 configure_env_block::<FEN>(&mut evm_env, block, config.networks);
                 tx_env.set_gas_limit(block.header().gas_limit());
                 tx_env.set_gas_price(block.header().base_fee_per_gas().unwrap_or_default() as u128);

crates/verify/src/utils.rs

@@ -103,7 +103,7 @@ pub fn print_result(
     res: Option<VerificationType>,
     bytecode_type: BytecodeType,
     json_results: &mut Vec<JsonResult>,
-    etherscan_config: Option<&Metadata>,
+    etherscan_metadata: Option<&Metadata>,
     config: &Config,
 ) {
     if let Some(res) = res {
@@ -121,8 +121,8 @@ pub fn print_result(
         let _ = sh_err!(
             "{bytecode_type:?} code did not match - this may be due to varying compiler settings"
         );
-        if let Some(etherscan_config) = etherscan_config {
-            let mismatches = find_mismatch_in_settings(etherscan_config, config);
+        if let Some(etherscan_metadata) = etherscan_metadata {
+            let mismatches = find_mismatch_in_settings(etherscan_metadata, config);
             for mismatch in mismatches {
                 let _ = sh_eprintln!("{}", mismatch.red().bold());
             }
@@ -241,7 +241,7 @@ pub fn check_and_encode_args(
     }
 }
 
-pub fn check_explorer_args(source_code: ContractMetadata) -> Result<Bytes, eyre::ErrReport> {
+pub fn check_explorer_args(source_code: &ContractMetadata) -> Result<Bytes, eyre::ErrReport> {
     if let Some(args) = source_code.items.first() {
         Ok(args.constructor_arguments.clone())
     } else {