Skip to content

Commit fbbcc8c

Browse files
authored
chore: use alloy-chains' is_arbitrum (#9432)
* use alloy-chains' is_arbitrum * clean up
1 parent 0f7268f commit fbbcc8c

File tree

2 files changed

+23
-35
lines changed

2 files changed

+23
-35
lines changed

crates/anvil/src/eth/backend/mem/mod.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3013,11 +3013,8 @@ pub fn prove_storage(storage: &HashMap<U256, U256>, keys: &[B256]) -> Vec<Vec<By
30133013
}
30143014

30153015
pub fn is_arbitrum(chain_id: u64) -> bool {
3016-
matches!(
3017-
NamedChain::try_from(chain_id),
3018-
Ok(NamedChain::Arbitrum |
3019-
NamedChain::ArbitrumTestnet |
3020-
NamedChain::ArbitrumGoerli |
3021-
NamedChain::ArbitrumNova)
3022-
)
3016+
if let Ok(chain) = NamedChain::try_from(chain_id) {
3017+
return chain.is_arbitrum()
3018+
}
3019+
false
30233020
}

crates/cli/src/utils/cmd.rs

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -159,41 +159,32 @@ pub fn init_progress(len: u64, label: &str) -> indicatif::ProgressBar {
159159
/// True if the network calculates gas costs differently.
160160
pub fn has_different_gas_calc(chain_id: u64) -> bool {
161161
if let Some(chain) = Chain::from(chain_id).named() {
162-
return matches!(
163-
chain,
164-
NamedChain::Acala |
165-
NamedChain::AcalaMandalaTestnet |
166-
NamedChain::AcalaTestnet |
167-
NamedChain::Arbitrum |
168-
NamedChain::ArbitrumGoerli |
169-
NamedChain::ArbitrumSepolia |
170-
NamedChain::ArbitrumTestnet |
171-
NamedChain::Etherlink |
172-
NamedChain::EtherlinkTestnet |
173-
NamedChain::Karura |
174-
NamedChain::KaruraTestnet |
175-
NamedChain::Mantle |
176-
NamedChain::MantleSepolia |
177-
NamedChain::MantleTestnet |
178-
NamedChain::Moonbase |
179-
NamedChain::Moonbeam |
180-
NamedChain::MoonbeamDev |
181-
NamedChain::Moonriver
182-
);
162+
return chain.is_arbitrum() ||
163+
matches!(
164+
chain,
165+
NamedChain::Acala |
166+
NamedChain::AcalaMandalaTestnet |
167+
NamedChain::AcalaTestnet |
168+
NamedChain::Etherlink |
169+
NamedChain::EtherlinkTestnet |
170+
NamedChain::Karura |
171+
NamedChain::KaruraTestnet |
172+
NamedChain::Mantle |
173+
NamedChain::MantleSepolia |
174+
NamedChain::MantleTestnet |
175+
NamedChain::Moonbase |
176+
NamedChain::Moonbeam |
177+
NamedChain::MoonbeamDev |
178+
NamedChain::Moonriver
179+
);
183180
}
184181
false
185182
}
186183

187184
/// True if it supports broadcasting in batches.
188185
pub fn has_batch_support(chain_id: u64) -> bool {
189186
if let Some(chain) = Chain::from(chain_id).named() {
190-
return !matches!(
191-
chain,
192-
NamedChain::Arbitrum |
193-
NamedChain::ArbitrumTestnet |
194-
NamedChain::ArbitrumGoerli |
195-
NamedChain::ArbitrumSepolia
196-
);
187+
return !chain.is_arbitrum();
197188
}
198189
true
199190
}

0 commit comments

Comments
 (0)