Skip to content

Commit c044f03

Browse files
committed
Merge #10083: [QA] Renaming rawTx into rawtx
dd5be2c [QA] Renaming rawTx into rawtx (NicolasDorier) Tree-SHA512: c999c3cbe7bbd00bf5cc9813741c485caea9925de1214c8a7ef717a7c109c1a8baf73b460db3b08f4ec138d773b46176531c48295504ed75180d4b3666b85b99
2 parents 1118493 + dd5be2c commit c044f03

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

test/functional/fundrawtransaction.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ def run_test(self):
322322
#compare fee of a standard pubkeyhash transaction
323323
inputs = []
324324
outputs = {self.nodes[1].getnewaddress():1.1}
325-
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
326-
fundedTx = self.nodes[0].fundrawtransaction(rawTx)
325+
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
326+
fundedTx = self.nodes[0].fundrawtransaction(rawtx)
327327

328328
#create same transaction over sendtoaddress
329329
txId = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1.1)
@@ -338,8 +338,8 @@ def run_test(self):
338338
#compare fee of a standard pubkeyhash transaction with multiple outputs
339339
inputs = []
340340
outputs = {self.nodes[1].getnewaddress():1.1,self.nodes[1].getnewaddress():1.2,self.nodes[1].getnewaddress():0.1,self.nodes[1].getnewaddress():1.3,self.nodes[1].getnewaddress():0.2,self.nodes[1].getnewaddress():0.3}
341-
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
342-
fundedTx = self.nodes[0].fundrawtransaction(rawTx)
341+
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
342+
fundedTx = self.nodes[0].fundrawtransaction(rawtx)
343343
#create same transaction over sendtoaddress
344344
txId = self.nodes[0].sendmany("", outputs)
345345
signedFee = self.nodes[0].getrawmempool(True)[txId]['fee']
@@ -364,8 +364,8 @@ def run_test(self):
364364

365365
inputs = []
366366
outputs = {mSigObj:1.1}
367-
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
368-
fundedTx = self.nodes[0].fundrawtransaction(rawTx)
367+
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
368+
fundedTx = self.nodes[0].fundrawtransaction(rawtx)
369369

370370
#create same transaction over sendtoaddress
371371
txId = self.nodes[0].sendtoaddress(mSigObj, 1.1)
@@ -397,8 +397,8 @@ def run_test(self):
397397

398398
inputs = []
399399
outputs = {mSigObj:1.1}
400-
rawTx = self.nodes[0].createrawtransaction(inputs, outputs)
401-
fundedTx = self.nodes[0].fundrawtransaction(rawTx)
400+
rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
401+
fundedTx = self.nodes[0].fundrawtransaction(rawtx)
402402

403403
#create same transaction over sendtoaddress
404404
txId = self.nodes[0].sendtoaddress(mSigObj, 1.1)
@@ -432,8 +432,8 @@ def run_test(self):
432432
oldBalance = self.nodes[1].getbalance()
433433
inputs = []
434434
outputs = {self.nodes[1].getnewaddress():1.1}
435-
rawTx = self.nodes[2].createrawtransaction(inputs, outputs)
436-
fundedTx = self.nodes[2].fundrawtransaction(rawTx)
435+
rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
436+
fundedTx = self.nodes[2].fundrawtransaction(rawtx)
437437

438438
signedTx = self.nodes[2].signrawtransaction(fundedTx['hex'])
439439
txId = self.nodes[2].sendrawtransaction(signedTx['hex'])
@@ -469,10 +469,10 @@ def run_test(self):
469469
self.nodes[1].getnewaddress()
470470
inputs = []
471471
outputs = {self.nodes[0].getnewaddress():1.1}
472-
rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
472+
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
473473
# fund a transaction that requires a new key for the change output
474474
# creating the key must be impossible because the wallet is locked
475-
assert_raises_jsonrpc(-4, "Keypool ran out, please call keypoolrefill first", self.nodes[1].fundrawtransaction, rawTx)
475+
assert_raises_jsonrpc(-4, "Keypool ran out, please call keypoolrefill first", self.nodes[1].fundrawtransaction, rawtx)
476476

477477
#refill the keypool
478478
self.nodes[1].walletpassphrase("test", 100)
@@ -484,8 +484,8 @@ def run_test(self):
484484

485485
inputs = []
486486
outputs = {self.nodes[0].getnewaddress():1.1}
487-
rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
488-
fundedTx = self.nodes[1].fundrawtransaction(rawTx)
487+
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
488+
fundedTx = self.nodes[1].fundrawtransaction(rawtx)
489489

490490
#now we need to unlock
491491
self.nodes[1].walletpassphrase("test", 600)
@@ -516,8 +516,8 @@ def run_test(self):
516516
#fund a tx with ~20 small inputs
517517
inputs = []
518518
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
519-
rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
520-
fundedTx = self.nodes[1].fundrawtransaction(rawTx)
519+
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
520+
fundedTx = self.nodes[1].fundrawtransaction(rawtx)
521521

522522
#create same transaction over sendtoaddress
523523
txId = self.nodes[1].sendmany("", outputs)
@@ -548,8 +548,8 @@ def run_test(self):
548548

549549
inputs = []
550550
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
551-
rawTx = self.nodes[1].createrawtransaction(inputs, outputs)
552-
fundedTx = self.nodes[1].fundrawtransaction(rawTx)
551+
rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
552+
fundedTx = self.nodes[1].fundrawtransaction(rawtx)
553553
fundedAndSignedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
554554
txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
555555
self.sync_all()

0 commit comments

Comments
 (0)