Skip to content

Commit 7825a06

Browse files
authored
feat(abi): Implement UIfmt for DSTest console logs (#10185)
1 parent 25c363e commit 7825a06

File tree

1 file changed

+22
-21
lines changed
  • crates/evm/abi/src/console

1 file changed

+22
-21
lines changed

crates/evm/abi/src/console/ds.rs

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,78 +4,79 @@ use super::{format_units_int, format_units_uint};
44
use alloy_primitives::hex;
55
use alloy_sol_types::sol;
66
use derive_more::Display;
7+
use foundry_common_fmt::UIfmt;
78
use itertools::Itertools;
89

9-
// TODO: Use `UiFmt`
10+
// Using UIfmt for consistent and user-friendly formatting
1011

1112
sol! {
1213
#[sol(abi)]
1314
#[derive(Display)]
1415
interface Console {
15-
#[display("{val}")]
16+
#[display("{}", val.pretty())]
1617
event log(string val);
1718

1819
#[display("{}", hex::encode_prefixed(val))]
1920
event logs(bytes val);
2021

21-
#[display("{val}")]
22+
#[display("{}", val.pretty())]
2223
event log_address(address val);
2324

24-
#[display("{val}")]
25+
#[display("{}", val.pretty())]
2526
event log_bytes32(bytes32 val);
2627

27-
#[display("{val}")]
28+
#[display("{}", val.pretty())]
2829
event log_int(int val);
2930

30-
#[display("{val}")]
31+
#[display("{}", val.pretty())]
3132
event log_uint(uint val);
3233

3334
#[display("{}", hex::encode_prefixed(val))]
3435
event log_bytes(bytes val);
3536

36-
#[display("{val}")]
37+
#[display("{}", val.pretty())]
3738
event log_string(string val);
3839

39-
#[display("[{}]", val.iter().format(", "))]
40+
#[display("[{}]", val.iter().map(|v| v.pretty()).format(", "))]
4041
event log_array(uint256[] val);
4142

42-
#[display("[{}]", val.iter().format(", "))]
43+
#[display("[{}]", val.iter().map(|v| v.pretty()).format(", "))]
4344
event log_array(int256[] val);
4445

45-
#[display("[{}]", val.iter().format(", "))]
46+
#[display("[{}]", val.iter().map(|v| v.pretty()).format(", "))]
4647
event log_array(address[] val);
4748

48-
#[display("{key}: {val}")]
49+
#[display("{}: {}", key.pretty(), val.pretty())]
4950
event log_named_address(string key, address val);
5051

51-
#[display("{key}: {val}")]
52+
#[display("{}: {}", key.pretty(), val.pretty())]
5253
event log_named_bytes32(string key, bytes32 val);
5354

54-
#[display("{key}: {}", format_units_int(val, decimals))]
55+
#[display("{}: {}", key.pretty(), format_units_int(val, decimals))]
5556
event log_named_decimal_int(string key, int val, uint decimals);
5657

57-
#[display("{key}: {}", format_units_uint(val, decimals))]
58+
#[display("{}: {}", key.pretty(), format_units_uint(val, decimals))]
5859
event log_named_decimal_uint(string key, uint val, uint decimals);
5960

60-
#[display("{key}: {val}")]
61+
#[display("{}: {}", key.pretty(), val.pretty())]
6162
event log_named_int(string key, int val);
6263

63-
#[display("{key}: {val}")]
64+
#[display("{}: {}", key.pretty(), val.pretty())]
6465
event log_named_uint(string key, uint val);
6566

66-
#[display("{key}: {}", hex::encode_prefixed(val))]
67+
#[display("{}: {}", key.pretty(), hex::encode_prefixed(val))]
6768
event log_named_bytes(string key, bytes val);
6869

69-
#[display("{key}: {val}")]
70+
#[display("{}: {}", key.pretty(), val.pretty())]
7071
event log_named_string(string key, string val);
7172

72-
#[display("{key}: [{}]", val.iter().format(", "))]
73+
#[display("{}: [{}]", key.pretty(), val.iter().map(|v| v.pretty()).format(", "))]
7374
event log_named_array(string key, uint256[] val);
7475

75-
#[display("{key}: [{}]", val.iter().format(", "))]
76+
#[display("{}: [{}]", key.pretty(), val.iter().map(|v| v.pretty()).format(", "))]
7677
event log_named_array(string key, int256[] val);
7778

78-
#[display("{key}: [{}]", val.iter().format(", "))]
79+
#[display("{}: [{}]", key.pretty(), val.iter().map(|v| v.pretty()).format(", "))]
7980
event log_named_array(string key, address[] val);
8081
}
8182
}

0 commit comments

Comments
 (0)