31
31
VERSION = 'fec61fa21a9f46f3b17bdcd660d7f4cd90b966aad3aec593c99b35f0aca15853'
32
32
33
33
def expected_messages (filename ):
34
- return ['Opened asmap file "{}" (59 bytes) from disk' . format ( filename ) ,
35
- 'Using asmap version {} for IP bucketing' . format ( VERSION ) ]
34
+ return [f 'Opened asmap file "{ filename } " (59 bytes) from disk' ,
35
+ f 'Using asmap version { VERSION } for IP bucketing' ]
36
36
37
37
class AsmapTest (BitcoinTestFramework ):
38
38
def set_test_params (self ):
@@ -50,7 +50,7 @@ def test_asmap_with_absolute_path(self):
50
50
filename = os .path .join (self .datadir , 'my-map-file.map' )
51
51
shutil .copyfile (self .asmap_raw , filename )
52
52
with self .node .assert_debug_log (expected_messages (filename )):
53
- self .start_node (0 , ['-asmap={}' . format ( filename ) ])
53
+ self .start_node (0 , [f '-asmap={ filename } ' ])
54
54
os .remove (filename )
55
55
56
56
def test_asmap_with_relative_path (self ):
@@ -60,13 +60,13 @@ def test_asmap_with_relative_path(self):
60
60
filename = os .path .join (self .datadir , name )
61
61
shutil .copyfile (self .asmap_raw , filename )
62
62
with self .node .assert_debug_log (expected_messages (filename )):
63
- self .start_node (0 , ['-asmap={}' . format ( name ) ])
63
+ self .start_node (0 , [f '-asmap={ name } ' ])
64
64
os .remove (filename )
65
65
66
66
def test_default_asmap (self ):
67
67
shutil .copyfile (self .asmap_raw , self .default_asmap )
68
68
for arg in ['-asmap' , '-asmap=' ]:
69
- self .log .info ('Test bitcoind {} (using default map file)' . format ( arg ) )
69
+ self .log .info (f 'Test bitcoind { arg } (using default map file)' )
70
70
self .stop_node (0 )
71
71
with self .node .assert_debug_log (expected_messages (self .default_asmap )):
72
72
self .start_node (0 , [arg ])
@@ -75,15 +75,15 @@ def test_default_asmap(self):
75
75
def test_default_asmap_with_missing_file (self ):
76
76
self .log .info ('Test bitcoind -asmap with missing default map file' )
77
77
self .stop_node (0 )
78
- msg = "Error: Could not find asmap file \" {}\" " . format ( self . default_asmap )
78
+ msg = f "Error: Could not find asmap file \" { self . default_asmap } \" "
79
79
self .node .assert_start_raises_init_error (extra_args = ['-asmap' ], expected_msg = msg )
80
80
81
81
def test_empty_asmap (self ):
82
82
self .log .info ('Test bitcoind -asmap with empty map file' )
83
83
self .stop_node (0 )
84
84
with open (self .default_asmap , "w" , encoding = "utf-8" ) as f :
85
85
f .write ("" )
86
- msg = "Error: Could not parse asmap file \" {}\" " . format ( self . default_asmap )
86
+ msg = f "Error: Could not parse asmap file \" { self . default_asmap } \" "
87
87
self .node .assert_start_raises_init_error (extra_args = ['-asmap' ], expected_msg = msg )
88
88
os .remove (self .default_asmap )
89
89
0 commit comments