clarify tests

foundry-rs · Mar 3, 2025 · 06ca6aa · 06ca6aa
1 parent 1fa39e5
commit 06ca6aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/crates/forge/tests/cli/utils.rs b/crates/forge/tests/cli/utils.rs
@@ -99,16 +99,6 @@ impl EnvExternalities {
         })
     }
 
-    pub fn sepolia() -> Option<Self> {
-        Some(Self {
-            chain: NamedChain::Sepolia,
-            rpc: network_rpc_key("sepolia")?,
-            pk: network_private_key("sepolia")?,
-            etherscan: etherscan_key(NamedChain::Sepolia)?,
-            verifier: "etherscan".to_string(),
-        })
-    }
-
     pub fn sepolia_etherscan() -> Option<Self> {
         Some(Self {
             chain: NamedChain::Sepolia,
@@ -128,7 +118,7 @@ impl EnvExternalities {
             verifier: "sourcify".to_string(),
         })
     }
-    
+
     pub fn sepolia_sourcify_with_etherscan_api_key_set() -> Option<Self> {
         Some(Self {
             chain: NamedChain::Sepolia,
@@ -148,7 +138,7 @@ impl EnvExternalities {
             verifier: "blockscout".to_string(),
         })
     }
-    
+
     pub fn sepolia_blockscout_with_etherscan_api_key_set() -> Option<Self> {
         Some(Self {
             chain: NamedChain::Sepolia,

diff --git a/crates/forge/tests/cli/verify.rs b/crates/forge/tests/cli/verify.rs
@@ -263,40 +263,37 @@ forgetest!(can_verify_random_contract_optimism_kovan, |prj, cmd| {
 
 // tests `create && contract-verify && verify-check` on Sepolia testnet if correct env vars are set
 forgetest!(can_verify_random_contract_sepolia, |prj, cmd| {
-    verify_on_chain(EnvExternalities::sepolia(), prj, cmd);
+    // Implicitly tests `--verifier etherscan` on Sepolia testnet
+    verify_on_chain(EnvExternalities::sepolia_etherscan(), prj, cmd);
 });
 
 // tests `create --verify on Sepolia testnet if correct env vars are set
 // SEPOLIA_RPC_URL=https://rpc.sepolia.org
 // TEST_PRIVATE_KEY=0x...
-// ETHERSCAN_API_KEY=
-forgetest!(can_create_verify_random_contract_sepolia, |prj, cmd| {
-    create_verify_on_chain(EnvExternalities::sepolia(), prj, cmd);
-});
-
-// tests `create --verify --verifier etherscan` on Sepolia testnet
-forgetest!(can_verify_random_contract_sepolia_etherscan, |prj, cmd| {
-    verify_on_chain(EnvExternalities::sepolia_etherscan(), prj, cmd);
+// ETHERSCAN_API_KEY=<API_KEY>
+forgetest!(can_create_verify_random_contract_sepolia_etherscan, |prj, cmd| {
+    // Implicitly tests `--verifier etherscan` on Sepolia testnet
+    create_verify_on_chain(EnvExternalities::sepolia_etherscan(), prj, cmd);
 });
 
 // tests `create --verify --verifier sourcify` on Sepolia testnet
-forgetest!(can_verify_random_contract_sepolia_sourcify, |prj, cmd| {
+forgetest!(can_create_verify_random_contract_sepolia_sourcify, |prj, cmd| {
     verify_on_chain(EnvExternalities::sepolia_sourcify(), prj, cmd);
 });
 
 // tests `create --verify --verifier sourcify` with etherscan api key set
 // <https://github.com/foundry-rs/foundry/issues/10000>
-forgetest!(can_verify_random_contract_sepolia_sourcify_with_etherscan_api_key_set, |prj, cmd| {
+forgetest!(can_create_verify_random_contract_sepolia_sourcify_with_etherscan_api_key_set, |prj, cmd| {
     verify_on_chain(EnvExternalities::sepolia_sourcify_with_etherscan_api_key_set(), prj, cmd);
 });
 
 // tests `create --verify --verifier blockscout` on Sepolia testnet
-forgetest!(can_verify_random_contract_sepolia_blockscout, |prj, cmd| {
+forgetest!(can_create_verify_random_contract_sepolia_blockscout, |prj, cmd| {
     verify_on_chain(EnvExternalities::sepolia_blockscout(), prj, cmd);
 });
 
 // tests `create --verify --verifier blockscout` on Sepolia testnet with etherscan api key set
-forgetest!(can_verify_random_contract_sepolia_blockscout_with_etherscan_api_key_set, |prj, cmd| {
+forgetest!(can_create_verify_random_contract_sepolia_blockscout_with_etherscan_api_key_set, |prj, cmd| {
     verify_on_chain(EnvExternalities::sepolia_blockscout_with_etherscan_api_key_set(), prj, cmd);
 });