@@ -4,78 +4,79 @@ use super::{format_units_int, format_units_uint};
4
4
use alloy_primitives:: hex;
5
5
use alloy_sol_types:: sol;
6
6
use derive_more:: Display ;
7
+ use foundry_common_fmt:: UIfmt ;
7
8
use itertools:: Itertools ;
8
9
9
- // TODO: Use `UiFmt`
10
+ // Using UIfmt for consistent and user-friendly formatting
10
11
11
12
sol ! {
12
13
#[ sol( abi) ]
13
14
#[ derive( Display ) ]
14
15
interface Console {
15
- #[ display( "{val}" ) ]
16
+ #[ display( "{}" , val . pretty ( ) ) ]
16
17
event log( string val) ;
17
18
18
19
#[ display( "{}" , hex:: encode_prefixed( val) ) ]
19
20
event logs( bytes val) ;
20
21
21
- #[ display( "{val}" ) ]
22
+ #[ display( "{}" , val . pretty ( ) ) ]
22
23
event log_address( address val) ;
23
24
24
- #[ display( "{val}" ) ]
25
+ #[ display( "{}" , val . pretty ( ) ) ]
25
26
event log_bytes32( bytes32 val) ;
26
27
27
- #[ display( "{val}" ) ]
28
+ #[ display( "{}" , val . pretty ( ) ) ]
28
29
event log_int( int val) ;
29
30
30
- #[ display( "{val}" ) ]
31
+ #[ display( "{}" , val . pretty ( ) ) ]
31
32
event log_uint( uint val) ;
32
33
33
34
#[ display( "{}" , hex:: encode_prefixed( val) ) ]
34
35
event log_bytes( bytes val) ;
35
36
36
- #[ display( "{val}" ) ]
37
+ #[ display( "{}" , val . pretty ( ) ) ]
37
38
event log_string( string val) ;
38
39
39
- #[ display( "[{}]" , val. iter( ) . format( ", " ) ) ]
40
+ #[ display( "[{}]" , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
40
41
event log_array( uint256[ ] val) ;
41
42
42
- #[ display( "[{}]" , val. iter( ) . format( ", " ) ) ]
43
+ #[ display( "[{}]" , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
43
44
event log_array( int256[ ] val) ;
44
45
45
- #[ display( "[{}]" , val. iter( ) . format( ", " ) ) ]
46
+ #[ display( "[{}]" , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
46
47
event log_array( address[ ] val) ;
47
48
48
- #[ display( "{key }: {val}" ) ]
49
+ #[ display( "{}: {}" , key . pretty ( ) , val . pretty ( ) ) ]
49
50
event log_named_address( string key, address val) ;
50
51
51
- #[ display( "{key }: {val}" ) ]
52
+ #[ display( "{}: {}" , key . pretty ( ) , val . pretty ( ) ) ]
52
53
event log_named_bytes32( string key, bytes32 val) ;
53
54
54
- #[ display( "{key }: {}" , format_units_int( val, decimals) ) ]
55
+ #[ display( "{}: {}" , key . pretty ( ) , format_units_int( val, decimals) ) ]
55
56
event log_named_decimal_int( string key, int val, uint decimals) ;
56
57
57
- #[ display( "{key }: {}" , format_units_uint( val, decimals) ) ]
58
+ #[ display( "{}: {}" , key . pretty ( ) , format_units_uint( val, decimals) ) ]
58
59
event log_named_decimal_uint( string key, uint val, uint decimals) ;
59
60
60
- #[ display( "{key }: {val}" ) ]
61
+ #[ display( "{}: {}" , key . pretty ( ) , val . pretty ( ) ) ]
61
62
event log_named_int( string key, int val) ;
62
63
63
- #[ display( "{key }: {val}" ) ]
64
+ #[ display( "{}: {}" , key . pretty ( ) , val . pretty ( ) ) ]
64
65
event log_named_uint( string key, uint val) ;
65
66
66
- #[ display( "{key }: {}" , hex:: encode_prefixed( val) ) ]
67
+ #[ display( "{}: {}" , key . pretty ( ) , hex:: encode_prefixed( val) ) ]
67
68
event log_named_bytes( string key, bytes val) ;
68
69
69
- #[ display( "{key }: {val}" ) ]
70
+ #[ display( "{}: {}" , key . pretty ( ) , val . pretty ( ) ) ]
70
71
event log_named_string( string key, string val) ;
71
72
72
- #[ display( "{key }: [{}]" , val. iter( ) . format( ", " ) ) ]
73
+ #[ display( "{}: [{}]" , key . pretty ( ) , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
73
74
event log_named_array( string key, uint256[ ] val) ;
74
75
75
- #[ display( "{key }: [{}]" , val. iter( ) . format( ", " ) ) ]
76
+ #[ display( "{}: [{}]" , key . pretty ( ) , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
76
77
event log_named_array( string key, int256[ ] val) ;
77
78
78
- #[ display( "{key }: [{}]" , val. iter( ) . format( ", " ) ) ]
79
+ #[ display( "{}: [{}]" , key . pretty ( ) , val. iter( ) . map ( |v| v . pretty ( ) ) . format( ", " ) ) ]
79
80
event log_named_array( string key, address[ ] val) ;
80
81
}
81
82
}
0 commit comments