Skip to content

Commit cb41ade

Browse files
jnewberyjnewbery
committed
[tests] fix flake8 warnings in wallet_importmulti.py
1 parent 86ff041 commit cb41ade

File tree

1 file changed

+32
-46
lines changed

1 file changed

+32
-46
lines changed

‎test/functional/wallet_importmulti.py

Lines changed: 32 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,25 @@ def skip_test_if_missing_module(self):
3232
def setup_network(self):
3333
self.setup_nodes()
3434

35-
def run_test (self):
35+
def run_test(self):
3636
self.log.info("Mining blocks...")
3737
self.nodes[0].generate(1)
3838
self.nodes[1].generate(1)
3939
timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
4040

4141
node0_address1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
4242

43-
#Check only one address
43+
# Check only one address
4444
assert_equal(node0_address1['ismine'], True)
4545

46-
#Node 1 sync test
47-
assert_equal(self.nodes[1].getblockcount(),1)
46+
# Node 1 sync test
47+
assert_equal(self.nodes[1].getblockcount(), 1)
4848

49-
#Address Test - before import
49+
# Address Test - before import
5050
address_info = self.nodes[1].getaddressinfo(node0_address1['address'])
5151
assert_equal(address_info['iswatchonly'], False)
5252
assert_equal(address_info['ismine'], False)
5353

54-
5554
# RPC importmulti -----------------------------------------------
5655

5756
# Bitcoin Address (implicit non-internal)
@@ -127,7 +126,6 @@ def run_test (self):
127126
assert_equal(address_assert['ismine'], False)
128127
assert_equal('timestamp' in address_assert, False)
129128

130-
131129
# Address + Public key + !Internal(explicit)
132130
self.log.info("Should import an address with public key")
133131
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -136,7 +134,7 @@ def run_test (self):
136134
"address": address['address']
137135
},
138136
"timestamp": "now",
139-
"pubkeys": [ address['pubkey'] ],
137+
"pubkeys": [address['pubkey']],
140138
"internal": False
141139
}])
142140
assert_equal(result[0]['success'], True)
@@ -145,14 +143,13 @@ def run_test (self):
145143
assert_equal(address_assert['ismine'], False)
146144
assert_equal(address_assert['timestamp'], timestamp)
147145

148-
149146
# ScriptPubKey + Public key + internal
150147
self.log.info("Should import a scriptPubKey with internal and with public key")
151148
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
152149
request = [{
153150
"scriptPubKey": address['scriptPubKey'],
154151
"timestamp": "now",
155-
"pubkeys": [ address['pubkey'] ],
152+
"pubkeys": [address['pubkey']],
156153
"internal": True
157154
}]
158155
result = self.nodes[1].importmulti(requests=request)
@@ -168,7 +165,7 @@ def run_test (self):
168165
request = [{
169166
"scriptPubKey": nonstandardScriptPubKey,
170167
"timestamp": "now",
171-
"pubkeys": [ address['pubkey'] ]
168+
"pubkeys": [address['pubkey']]
172169
}]
173170
result = self.nodes[1].importmulti(requests=request)
174171
assert_equal(result[0]['success'], False)
@@ -187,7 +184,7 @@ def run_test (self):
187184
"address": address['address']
188185
},
189186
"timestamp": "now",
190-
"keys": [ self.nodes[0].dumpprivkey(address['address']) ]
187+
"keys": [self.nodes[0].dumpprivkey(address['address'])]
191188
}])
192189
assert_equal(result[0]['success'], True)
193190
address_assert = self.nodes[1].getaddressinfo(address['address'])
@@ -201,7 +198,7 @@ def run_test (self):
201198
"address": address['address']
202199
},
203200
"timestamp": "now",
204-
"keys": [ self.nodes[0].dumpprivkey(address['address']) ]
201+
"keys": [self.nodes[0].dumpprivkey(address['address'])]
205202
}])
206203
assert_equal(result[0]['success'], False)
207204
assert_equal(result[0]['error']['code'], -4)
@@ -215,7 +212,7 @@ def run_test (self):
215212
"address": address['address']
216213
},
217214
"timestamp": "now",
218-
"keys": [ self.nodes[0].dumpprivkey(address['address']) ],
215+
"keys": [self.nodes[0].dumpprivkey(address['address'])],
219216
"watchonly": True
220217
}])
221218
assert_equal(result[0]['success'], False)
@@ -232,7 +229,7 @@ def run_test (self):
232229
result = self.nodes[1].importmulti([{
233230
"scriptPubKey": address['scriptPubKey'],
234231
"timestamp": "now",
235-
"keys": [ self.nodes[0].dumpprivkey(address['address']) ],
232+
"keys": [self.nodes[0].dumpprivkey(address['address'])],
236233
"internal": True
237234
}])
238235
assert_equal(result[0]['success'], True)
@@ -247,7 +244,7 @@ def run_test (self):
247244
result = self.nodes[1].importmulti([{
248245
"scriptPubKey": nonstandardScriptPubKey,
249246
"timestamp": "now",
250-
"keys": [ self.nodes[0].dumpprivkey(address['address']) ]
247+
"keys": [self.nodes[0].dumpprivkey(address['address'])]
251248
}])
252249
assert_equal(result[0]['success'], False)
253250
assert_equal(result[0]['error']['code'], -8)
@@ -257,7 +254,6 @@ def run_test (self):
257254
assert_equal(address_assert['ismine'], False)
258255
assert_equal('timestamp' in address_assert, False)
259256

260-
261257
# P2SH address
262258
sig_address_1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
263259
sig_address_2 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -280,11 +276,10 @@ def run_test (self):
280276
assert_equal(address_assert['isscript'], True)
281277
assert_equal(address_assert['iswatchonly'], True)
282278
assert_equal(address_assert['timestamp'], timestamp)
283-
p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
279+
p2shunspent = self.nodes[1].listunspent(0, 999999, [multi_sig_script['address']])[0]
284280
assert_equal(p2shunspent['spendable'], False)
285281
assert_equal(p2shunspent['solvable'], False)
286282

287-
288283
# P2SH + Redeem script
289284
sig_address_1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
290285
sig_address_2 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -307,11 +302,10 @@ def run_test (self):
307302
address_assert = self.nodes[1].getaddressinfo(multi_sig_script['address'])
308303
assert_equal(address_assert['timestamp'], timestamp)
309304

310-
p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
305+
p2shunspent = self.nodes[1].listunspent(0, 999999, [multi_sig_script['address']])[0]
311306
assert_equal(p2shunspent['spendable'], False)
312307
assert_equal(p2shunspent['solvable'], True)
313308

314-
315309
# P2SH + Redeem script + Private Keys + !Watchonly
316310
sig_address_1 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
317311
sig_address_2 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -329,13 +323,13 @@ def run_test (self):
329323
},
330324
"timestamp": "now",
331325
"redeemscript": multi_sig_script['redeemScript'],
332-
"keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
326+
"keys": [self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
333327
}])
334328
assert_equal(result[0]['success'], True)
335329
address_assert = self.nodes[1].getaddressinfo(multi_sig_script['address'])
336330
assert_equal(address_assert['timestamp'], timestamp)
337331

338-
p2shunspent = self.nodes[1].listunspent(0,999999, [multi_sig_script['address']])[0]
332+
p2shunspent = self.nodes[1].listunspent(0, 999999, [multi_sig_script['address']])[0]
339333
assert_equal(p2shunspent['spendable'], False)
340334
assert_equal(p2shunspent['solvable'], True)
341335

@@ -356,14 +350,13 @@ def run_test (self):
356350
},
357351
"timestamp": "now",
358352
"redeemscript": multi_sig_script['redeemScript'],
359-
"keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])],
353+
"keys": [self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])],
360354
"watchonly": True
361355
}])
362356
assert_equal(result[0]['success'], False)
363357
assert_equal(result[0]['error']['code'], -8)
364358
assert_equal(result[0]['error']['message'], 'Watch-only addresses should not include private keys')
365359

366-
367360
# Address + Public key + !Internal + Wrong pubkey
368361
self.log.info("Should not import an address with a wrong public key")
369362
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -373,7 +366,7 @@ def run_test (self):
373366
"address": address['address']
374367
},
375368
"timestamp": "now",
376-
"pubkeys": [ address2['pubkey'] ]
369+
"pubkeys": [address2['pubkey']]
377370
}])
378371
assert_equal(result[0]['success'], False)
379372
assert_equal(result[0]['error']['code'], -5)
@@ -383,15 +376,14 @@ def run_test (self):
383376
assert_equal(address_assert['ismine'], False)
384377
assert_equal('timestamp' in address_assert, False)
385378

386-
387379
# ScriptPubKey + Public key + internal + Wrong pubkey
388380
self.log.info("Should not import a scriptPubKey with internal and with a wrong public key")
389381
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
390382
address2 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
391383
request = [{
392384
"scriptPubKey": address['scriptPubKey'],
393385
"timestamp": "now",
394-
"pubkeys": [ address2['pubkey'] ],
386+
"pubkeys": [address2['pubkey']],
395387
"internal": True
396388
}]
397389
result = self.nodes[1].importmulti(request)
@@ -403,7 +395,6 @@ def run_test (self):
403395
assert_equal(address_assert['ismine'], False)
404396
assert_equal('timestamp' in address_assert, False)
405397

406-
407398
# Address + Private key + !watchonly + Wrong private key
408399
self.log.info("Should not import an address with a wrong private key")
409400
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
@@ -413,7 +404,7 @@ def run_test (self):
413404
"address": address['address']
414405
},
415406
"timestamp": "now",
416-
"keys": [ self.nodes[0].dumpprivkey(address2['address']) ]
407+
"keys": [self.nodes[0].dumpprivkey(address2['address'])]
417408
}])
418409
assert_equal(result[0]['success'], False)
419410
assert_equal(result[0]['error']['code'], -5)
@@ -423,15 +414,14 @@ def run_test (self):
423414
assert_equal(address_assert['ismine'], False)
424415
assert_equal('timestamp' in address_assert, False)
425416

426-
427417
# ScriptPubKey + Private key + internal + Wrong private key
428418
self.log.info("Should not import a scriptPubKey with internal and with a wrong private key")
429419
address = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
430420
address2 = self.nodes[0].getaddressinfo(self.nodes[0].getnewaddress())
431421
result = self.nodes[1].importmulti([{
432422
"scriptPubKey": address['scriptPubKey'],
433423
"timestamp": "now",
434-
"keys": [ self.nodes[0].dumpprivkey(address2['address']) ],
424+
"keys": [self.nodes[0].dumpprivkey(address2['address'])],
435425
"internal": True
436426
}])
437427
assert_equal(result[0]['success'], False)
@@ -442,7 +432,6 @@ def run_test (self):
442432
assert_equal(address_assert['ismine'], False)
443433
assert_equal('timestamp' in address_assert, False)
444434

445-
446435
# Importing existing watch only address with new timestamp should replace saved timestamp.
447436
assert_greater_than(timestamp, watchonly_timestamp)
448437
self.log.info("Should replace previously saved watch only timestamp.")
@@ -459,7 +448,6 @@ def run_test (self):
459448
assert_equal(address_assert['timestamp'], timestamp)
460449
watchonly_timestamp = timestamp
461450

462-
463451
# restart nodes to check for proper serialization/deserialization of watch only address
464452
self.stop_nodes()
465453
self.start_nodes()
@@ -471,14 +459,12 @@ def run_test (self):
471459
# Bad or missing timestamps
472460
self.log.info("Should throw on invalid or missing timestamp values")
473461
assert_raises_rpc_error(-3, 'Missing required timestamp field for key',
474-
self.nodes[1].importmulti, [{
475-
"scriptPubKey": address['scriptPubKey'],
476-
}])
462+
self.nodes[1].importmulti, [{"scriptPubKey": address['scriptPubKey']}])
477463
assert_raises_rpc_error(-3, 'Expected number or "now" timestamp value for key. got type string',
478-
self.nodes[1].importmulti, [{
479-
"scriptPubKey": address['scriptPubKey'],
480-
"timestamp": "",
481-
}])
464+
self.nodes[1].importmulti, [{
465+
"scriptPubKey": address['scriptPubKey'],
466+
"timestamp": ""
467+
}])
482468

483469
# Import P2WPKH address as watch only
484470
self.log.info("Should import a P2WPKH address as watch only")
@@ -502,7 +488,7 @@ def run_test (self):
502488
"address": address['address']
503489
},
504490
"timestamp": "now",
505-
"pubkeys": [ address['pubkey'] ]
491+
"pubkeys": [address['pubkey']]
506492
}])
507493
assert_equal(result[0]['success'], True)
508494
address_assert = self.nodes[1].getaddressinfo(address['address'])
@@ -547,7 +533,7 @@ def run_test (self):
547533
},
548534
"timestamp": "now",
549535
"witnessscript": multi_sig_script['redeemScript'],
550-
"keys": [ self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address']) ]
536+
"keys": [self.nodes[0].dumpprivkey(sig_address_1['address']), self.nodes[0].dumpprivkey(sig_address_2['address'])]
551537
}])
552538
assert_equal(result[0]['success'], True)
553539
address_assert = self.nodes[1].getaddressinfo(multi_sig_script['address'])
@@ -579,7 +565,7 @@ def run_test (self):
579565
},
580566
"timestamp": "now",
581567
"redeemscript": bytes_to_hex_str(pkscript),
582-
"pubkeys": [ sig_address_1['pubkey'] ]
568+
"pubkeys": [sig_address_1['pubkey']]
583569
}])
584570
assert_equal(result[0]['success'], True)
585571
address_assert = self.nodes[1].getaddressinfo(sig_address_1['address'])
@@ -597,7 +583,7 @@ def run_test (self):
597583
},
598584
"timestamp": "now",
599585
"redeemscript": bytes_to_hex_str(pkscript),
600-
"keys": [ self.nodes[0].dumpprivkey(sig_address_1['address'])]
586+
"keys": [self.nodes[0].dumpprivkey(sig_address_1['address'])]
601587
}])
602588
assert_equal(result[0]['success'], True)
603589
address_assert = self.nodes[1].getaddressinfo(sig_address_1['address'])
@@ -623,4 +609,4 @@ def run_test (self):
623609
assert_equal(address_assert['solvable'], True)
624610

625611
if __name__ == '__main__':
626-
ImportMultiTest ().main ()
612+
ImportMultiTest().main()

0 commit comments

Comments
 (0)