@@ -65,11 +65,9 @@ def validate_result(self, response: Tuple[BlockHeader, ...]) -> None:
65
65
if first_header .hash != self .block_number_or_hash :
66
66
raise ValidationError (
67
67
"Returned headers cannot be matched to header request. "
68
- "Expected first header to have hash of {0} but instead got "
69
- "{1}." .format (
70
- encode_hex (self .block_number_or_hash ),
71
- encode_hex (first_header .hash ),
72
- )
68
+ "Expected first header to have hash of "
69
+ f"{ encode_hex (self .block_number_or_hash )} but instead got "
70
+ f"{ encode_hex (first_header .hash )} ."
73
71
)
74
72
75
73
block_numbers : Tuple [BlockNumber , ...] = tuple (
@@ -115,8 +113,7 @@ def _validate_sequence(self, block_numbers: Tuple[BlockNumber, ...]) -> None:
115
113
# check for numbers that should not be present.
116
114
unexpected_numbers = set (block_numbers ).difference (expected_numbers )
117
115
if unexpected_numbers :
118
- raise ValidationError (
119
- 'Unexpected numbers: {0}' .format (unexpected_numbers ))
116
+ raise ValidationError (f'Unexpected numbers: { unexpected_numbers } ' )
120
117
121
118
# check that the numbers are correctly ordered.
122
119
expected_order = tuple (sorted (
@@ -126,8 +123,8 @@ def _validate_sequence(self, block_numbers: Tuple[BlockNumber, ...]) -> None:
126
123
if block_numbers != expected_order :
127
124
raise ValidationError (
128
125
'Returned headers are not correctly ordered.\n '
129
- 'Expected: {0 }\n '
130
- 'Got : {1 }\n ' . format ( expected_order , block_numbers )
126
+ f 'Expected: { expected_order } \n '
127
+ f 'Got : { block_numbers } \n '
131
128
)
132
129
133
130
# check that all provided numbers are an ordered subset of the master
@@ -140,6 +137,6 @@ def _validate_sequence(self, block_numbers: Tuple[BlockNumber, ...]) -> None:
140
137
else :
141
138
raise ValidationError (
142
139
'Returned headers contain an unexpected block number.\n '
143
- 'Unexpected Number: {0 }\n '
144
- 'Expected Numbers : {1}' . format ( number , expected_numbers )
140
+ f 'Unexpected Number: { number } \n '
141
+ f 'Expected Numbers : { expected_numbers } '
145
142
)
0 commit comments