Skip to content

Commit c3c880f

Browse files
healthyyyounghealthyyyoung
authored
chore(all): replace 0x prefix from_str(...).unwrap() with macros (foundry-rs#10222)
* chore(all): replace from_str(...).unwrap() with macros * fix test
1 parent 0aeb4e1 commit c3c880f

File tree

9 files changed

+39
-52
lines changed

9 files changed

+39
-52
lines changed

‎crates/anvil/src/eth/backend/mem/in_memory_db.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,15 @@ impl MaybeForkedDatabase for MemDb {
143143
#[cfg(test)]
144144
mod tests {
145145
use super::*;
146-
use alloy_primitives::Bytes;
146+
use alloy_primitives::{address, Bytes};
147147
use foundry_evm::revm::primitives::{Bytecode, KECCAK_EMPTY};
148-
use std::{collections::BTreeMap, str::FromStr};
148+
use std::collections::BTreeMap;
149149

150150
// verifies that all substantial aspects of a loaded account remain the same after an account
151151
// is dumped and reloaded
152152
#[test]
153153
fn test_dump_reload_cycle() {
154-
let test_addr: Address =
155-
Address::from_str("0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266").unwrap();
154+
let test_addr: Address = address!("0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266");
156155

157156
let mut dump_db = MemDb::default();
158157

@@ -192,10 +191,8 @@ mod tests {
192191
// accounts as well.
193192
#[test]
194193
fn test_load_state_merge() {
195-
let test_addr: Address =
196-
Address::from_str("0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266").unwrap();
197-
let test_addr2: Address =
198-
Address::from_str("0x70997970c51812dc3a010c7d01b50e0d17dc79c8").unwrap();
194+
let test_addr: Address = address!("0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266");
195+
let test_addr2: Address = address!("0x70997970c51812dc3a010c7d01b50e0d17dc79c8");
199196

200197
let contract_code = Bytecode::new_raw(Bytes::from("fake contract code"));
201198

‎crates/cast/src/cmd/create2.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,7 @@ mod tests {
336336
]);
337337
let create2_out = args.run().unwrap();
338338
let address = create2_out.address;
339-
assert_eq!(
340-
address,
341-
Address::from_str("0x533AE9D683B10C02EBDB05471642F85230071FC3").unwrap()
342-
);
339+
assert_eq!(address, address!("0x533AE9D683B10C02EBDB05471642F85230071FC3"));
343340
}
344341

345342
#[test]

‎crates/common/fmt/src/console.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ fn format_spec<'a>(
410410
#[cfg(test)]
411411
mod tests {
412412
use super::*;
413-
use alloy_primitives::B256;
413+
use alloy_primitives::{address, B256};
414414
use foundry_macros::ConsoleFmt;
415415
use std::str::FromStr;
416416

@@ -502,7 +502,7 @@ mod tests {
502502
fmt_1("%o", &b32)
503503
);
504504

505-
let addr = Address::from_str("0xdEADBEeF00000000000000000000000000000000").unwrap();
505+
let addr = address!("0xdEADBEeF00000000000000000000000000000000");
506506
assert_eq!("0xdEADBEeF00000000000000000000000000000000", fmt_1("%s", &addr));
507507
assert_eq!("NaN", fmt_1("%d", &addr));
508508
assert_eq!("NaN", fmt_1("%i", &addr));
@@ -582,7 +582,7 @@ mod tests {
582582

583583
let log3 = Log3 {
584584
p_0: String::from("foo %s %%s %s and %d foo %%"),
585-
p_1: Address::from_str("0xdEADBEeF00000000000000000000000000000000").unwrap(),
585+
p_1: address!("0xdEADBEeF00000000000000000000000000000000"),
586586
p_2: true,
587587
p_3: U256::from(21),
588588
};

‎crates/common/src/constants.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,12 @@ pub fn is_impersonated_sig(sig: &PrimitiveSignature, ty: u8) -> bool {
7777
#[cfg(test)]
7878
mod tests {
7979
use super::*;
80-
use std::str::FromStr;
8180

8281
#[test]
8382
fn test_constant_sender() {
84-
let arb = Address::from_str("0x00000000000000000000000000000000000a4b05").unwrap();
83+
let arb = address!("0x00000000000000000000000000000000000a4b05");
8584
assert_eq!(arb, ARBITRUM_SENDER);
86-
let base = Address::from_str("0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001").unwrap();
85+
let base = address!("0xdeaddeaddeaddeaddeaddeaddeaddeaddead0001");
8786
assert_eq!(base, OPTIMISM_SYSTEM_ADDRESS);
8887
}
8988
}

‎crates/config/src/lib.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2564,10 +2564,7 @@ mod tests {
25642564

25652565
#[test]
25662566
fn default_sender() {
2567-
assert_eq!(
2568-
Config::DEFAULT_SENDER,
2569-
Address::from_str("0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38").unwrap()
2570-
);
2567+
assert_eq!(Config::DEFAULT_SENDER, address!("0x1804c8AB1F12E6bbf3894d4083f33e07309d1f38"));
25712568
}
25722569

25732570
#[test]
@@ -4795,11 +4792,11 @@ mod tests {
47954792
config.labels,
47964793
AddressHashMap::from_iter(vec![
47974794
(
4798-
Address::from_str("0x1F98431c8aD98523631AE4a59f267346ea31F984").unwrap(),
4795+
address!("0x1F98431c8aD98523631AE4a59f267346ea31F984"),
47994796
"Uniswap V3: Factory".to_string()
48004797
),
48014798
(
4802-
Address::from_str("0xC36442b4a4522E871399CD717aBDD847Ab11FE88").unwrap(),
4799+
address!("0xC36442b4a4522E871399CD717aBDD847Ab11FE88"),
48034800
"Uniswap V3: Positions NFT".to_string()
48044801
),
48054802
])

‎crates/forge/tests/cli/script.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use foundry_test_utils::{
1212
};
1313
use regex::Regex;
1414
use serde_json::Value;
15-
use std::{env, fs, path::PathBuf, str::FromStr};
15+
use std::{env, fs, path::PathBuf};
1616

1717
// Tests that fork cheat codes can be used in script
1818
forgetest_init!(
@@ -702,13 +702,13 @@ forgetest_async!(can_deploy_script_private_key, |prj, cmd| {
702702
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
703703

704704
tester
705-
.load_addresses(&[Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap()])
705+
.load_addresses(&[address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906")])
706706
.await
707707
.add_sig("BroadcastTest", "deployPrivateKey()")
708708
.simulate(ScriptOutcome::OkSimulation)
709709
.broadcast(ScriptOutcome::OkBroadcast)
710710
.assert_nonce_increment_addresses(&[(
711-
Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap(),
711+
address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906"),
712712
3,
713713
)])
714714
.await;
@@ -731,13 +731,13 @@ forgetest_async!(can_deploy_script_remember_key, |prj, cmd| {
731731
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
732732

733733
tester
734-
.load_addresses(&[Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap()])
734+
.load_addresses(&[address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906")])
735735
.await
736736
.add_sig("BroadcastTest", "deployRememberKey()")
737737
.simulate(ScriptOutcome::OkSimulation)
738738
.broadcast(ScriptOutcome::OkBroadcast)
739739
.assert_nonce_increment_addresses(&[(
740-
Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap(),
740+
address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906"),
741741
2,
742742
)])
743743
.await;
@@ -749,7 +749,7 @@ forgetest_async!(can_deploy_script_remember_key_and_resume, |prj, cmd| {
749749

750750
tester
751751
.add_deployer(0)
752-
.load_addresses(&[Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap()])
752+
.load_addresses(&[address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906")])
753753
.await
754754
.add_sig("BroadcastTest", "deployRememberKeyResume()")
755755
.simulate(ScriptOutcome::OkSimulation)
@@ -759,7 +759,7 @@ forgetest_async!(can_deploy_script_remember_key_and_resume, |prj, cmd| {
759759
.await
760760
.run(ScriptOutcome::OkBroadcast)
761761
.assert_nonce_increment_addresses(&[(
762-
Address::from_str("0x90F79bf6EB2c4f870365E785982E1f101E93b906").unwrap(),
762+
address!("0x90F79bf6EB2c4f870365E785982E1f101E93b906"),
763763
1,
764764
)])
765765
.await
@@ -855,7 +855,7 @@ forgetest_async!(can_deploy_with_create2, |prj, cmd| {
855855
forgetest_async!(can_deploy_with_custom_create2, |prj, cmd| {
856856
let (api, handle) = spawn(NodeConfig::test()).await;
857857
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
858-
let create2 = Address::from_str("0x0000000000000000000000000000000000b4956c").unwrap();
858+
let create2 = address!("0x0000000000000000000000000000000000b4956c");
859859

860860
// Prepare CREATE2 Deployer
861861
api.anvil_set_code(
@@ -881,7 +881,7 @@ forgetest_async!(can_deploy_with_custom_create2, |prj, cmd| {
881881
forgetest_async!(can_deploy_with_custom_create2_notmatched_bytecode, |prj, cmd| {
882882
let (api, handle) = spawn(NodeConfig::test()).await;
883883
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
884-
let create2 = Address::from_str("0x0000000000000000000000000000000000b4956c").unwrap();
884+
let create2 = address!("0x0000000000000000000000000000000000b4956c");
885885

886886
// Prepare CREATE2 Deployer
887887
api.anvil_set_code(
@@ -904,7 +904,7 @@ forgetest_async!(can_deploy_with_custom_create2_notmatched_bytecode, |prj, cmd|
904904
forgetest_async!(canot_deploy_with_nonexist_create2, |prj, cmd| {
905905
let (_api, handle) = spawn(NodeConfig::test()).await;
906906
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
907-
let create2 = Address::from_str("0x0000000000000000000000000000000000b4956c").unwrap();
907+
let create2 = address!("0x0000000000000000000000000000000000b4956c");
908908

909909
tester
910910
.add_deployer(0)
@@ -974,7 +974,7 @@ forgetest_async!(check_broadcast_log, |prj, cmd| {
974974
let mut tester = ScriptTester::new_broadcast(cmd, &handle.http_endpoint(), prj.root());
975975

976976
// Prepare CREATE2 Deployer
977-
let addr = Address::from_str("0x4e59b44847b379578588920ca78fbf26c0b4956c").unwrap();
977+
let addr = address!("0x4e59b44847b379578588920ca78fbf26c0b4956c");
978978
let code = hex::decode("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3").expect("Could not decode create2 deployer init_code").into();
979979
api.anvil_set_code(addr, code).await.unwrap();
980980

‎crates/linking/src/lib.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ impl<'a> Linker<'a> {
283283
#[cfg(test)]
284284
mod tests {
285285
use super::*;
286-
use alloy_primitives::{fixed_bytes, map::HashMap};
286+
use alloy_primitives::{address, fixed_bytes, map::HashMap};
287287
use foundry_compilers::{
288288
multi::MultiCompiler,
289289
solc::{Solc, SolcCompiler},
@@ -427,14 +427,14 @@ mod tests {
427427
"default/linking/simple/Simple.t.sol:LibraryConsumer".to_string(),
428428
vec![(
429429
"default/linking/simple/Simple.t.sol:Lib".to_string(),
430-
Address::from_str("0x5a443704dd4b594b382c22a083e2bd3090a6fef3").unwrap(),
430+
address!("0x5a443704dd4b594b382c22a083e2bd3090a6fef3"),
431431
)],
432432
)
433433
.assert_dependencies(
434434
"default/linking/simple/Simple.t.sol:SimpleLibraryLinkingTest".to_string(),
435435
vec![(
436436
"default/linking/simple/Simple.t.sol:Lib".to_string(),
437-
Address::from_str("0x5a443704dd4b594b382c22a083e2bd3090a6fef3").unwrap(),
437+
address!("0x5a443704dd4b594b382c22a083e2bd3090a6fef3"),
438438
)],
439439
)
440440
.test_with_sender_and_nonce(Address::default(), 1);
@@ -450,7 +450,7 @@ mod tests {
450450
"default/linking/nested/Nested.t.sol:NestedLib".to_string(),
451451
vec![(
452452
"default/linking/nested/Nested.t.sol:Lib".to_string(),
453-
Address::from_str("0x5a443704dd4b594b382c22a083e2bd3090a6fef3").unwrap(),
453+
address!("0x5a443704dd4b594b382c22a083e2bd3090a6fef3"),
454454
)],
455455
)
456456
.assert_dependencies(
@@ -505,14 +505,14 @@ mod tests {
505505
"default/linking/duplicate/Duplicate.t.sol:C".to_string(),
506506
vec![(
507507
"default/linking/duplicate/Duplicate.t.sol:A".to_string(),
508-
Address::from_str("0x5a443704dd4b594b382c22a083e2bd3090a6fef3").unwrap(),
508+
address!("0x5a443704dd4b594b382c22a083e2bd3090a6fef3"),
509509
)],
510510
)
511511
.assert_dependencies(
512512
"default/linking/duplicate/Duplicate.t.sol:D".to_string(),
513513
vec![(
514514
"default/linking/duplicate/Duplicate.t.sol:B".to_string(),
515-
Address::from_str("0x5a443704dd4b594b382c22a083e2bd3090a6fef3").unwrap(),
515+
address!("0x5a443704dd4b594b382c22a083e2bd3090a6fef3"),
516516
)],
517517
)
518518
.assert_dependencies(
@@ -642,7 +642,7 @@ mod tests {
642642
"default/linking/nested/Nested.t.sol:NestedLib".to_string(),
643643
vec![(
644644
"default/linking/nested/Nested.t.sol:Lib".to_string(),
645-
Address::from_str("0xddb1Cd2497000DAeA687CEa3dc34Af44084BEa74").unwrap(),
645+
address!("0xddb1Cd2497000DAeA687CEa3dc34Af44084BEa74"),
646646
)],
647647
)
648648
.assert_dependencies(

‎crates/test-utils/src/script.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
use crate::{init_tracing, util::lossy_string, TestCommand};
2-
use alloy_primitives::Address;
2+
use alloy_primitives::{address, Address};
33
use alloy_provider::Provider;
44
use eyre::Result;
55
use foundry_common::provider::{get_http_provider, RetryProvider};
66
use std::{
77
collections::BTreeMap,
88
fs,
99
path::{Path, PathBuf},
10-
str::FromStr,
1110
};
1211

1312
const BROADCAST_TEST_PATH: &str = "src/Broadcast.t.sol";
@@ -70,9 +69,9 @@ impl ScriptTester {
7069

7170
Self {
7271
accounts_pub: vec![
73-
Address::from_str("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266").unwrap(),
74-
Address::from_str("0x70997970C51812dc3A010C7d01b50e0d17dc79C8").unwrap(),
75-
Address::from_str("0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC").unwrap(),
72+
address!("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"),
73+
address!("0x70997970C51812dc3A010C7d01b50e0d17dc79C8"),
74+
address!("0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC"),
7675
],
7776
accounts_priv: vec![
7877
"ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80".to_string(),

‎crates/wallets/src/multi_wallet.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ impl MultiWalletOpts {
402402
#[cfg(test)]
403403
mod tests {
404404
use super::*;
405-
use std::{path::Path, str::FromStr};
405+
use alloy_primitives::address;
406+
use std::path::Path;
406407

407408
#[test]
408409
fn parse_keystore_args() {
@@ -440,10 +441,7 @@ mod tests {
440441

441442
let (_, unlocked) = args.keystores().unwrap().unwrap();
442443
assert_eq!(unlocked.len(), 1);
443-
assert_eq!(
444-
unlocked[0].address(),
445-
Address::from_str("0xec554aeafe75601aaab43bd4621a22284db566c2").unwrap()
446-
);
444+
assert_eq!(unlocked[0].address(), address!("0xec554aeafe75601aaab43bd4621a22284db566c2"));
447445
}
448446

449447
// https://github.com/foundry-rs/foundry/issues/5179

0 commit comments

Comments
 (0)