Merge #10083: [QA] Renaming rawTx into rawtx

dd5be2c [QA] Renaming rawTx into rawtx (NicolasDorier)

Tree-SHA512: c999c3cbe7bbd00bf5cc9813741c485caea9925de1214c8a7ef717a7c109c1a8baf73b460db3b08f4ec138d773b46176531c48295504ed75180d4b3666b85b99
This commit is contained in:
Wladimir J. van der Laan 2017-03-27 09:10:37 +02:00 committed by Pasta
parent 1781c7a701
commit 1209417938
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6

View File

@ -327,8 +327,8 @@ class RawTransactionsTest(BitcoinTestFramework):
#compare fee of a standard pubkeyhash transaction #compare fee of a standard pubkeyhash transaction
inputs = [] inputs = []
outputs = {self.nodes[1].getnewaddress():11} outputs = {self.nodes[1].getnewaddress():11}
rawTx = self.nodes[0].createrawtransaction(inputs, outputs) rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[0].fundrawtransaction(rawTx) fundedTx = self.nodes[0].fundrawtransaction(rawtx)
#create same transaction over sendtoaddress #create same transaction over sendtoaddress
txId = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 11) txId = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 11)
@ -343,8 +343,8 @@ class RawTransactionsTest(BitcoinTestFramework):
#compare fee of a standard pubkeyhash transaction with multiple outputs #compare fee of a standard pubkeyhash transaction with multiple outputs
inputs = [] inputs = []
outputs = {self.nodes[1].getnewaddress():11,self.nodes[1].getnewaddress():12,self.nodes[1].getnewaddress():1,self.nodes[1].getnewaddress():13,self.nodes[1].getnewaddress():2,self.nodes[1].getnewaddress():3} outputs = {self.nodes[1].getnewaddress():11,self.nodes[1].getnewaddress():12,self.nodes[1].getnewaddress():1,self.nodes[1].getnewaddress():13,self.nodes[1].getnewaddress():2,self.nodes[1].getnewaddress():3}
rawTx = self.nodes[0].createrawtransaction(inputs, outputs) rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[0].fundrawtransaction(rawTx) fundedTx = self.nodes[0].fundrawtransaction(rawtx)
#create same transaction over sendtoaddress #create same transaction over sendtoaddress
txId = self.nodes[0].sendmany("", outputs) txId = self.nodes[0].sendmany("", outputs)
signedFee = self.nodes[0].getrawmempool(True)[txId]['fee'] signedFee = self.nodes[0].getrawmempool(True)[txId]['fee']
@ -369,8 +369,8 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = [] inputs = []
outputs = {mSigObj:11} outputs = {mSigObj:11}
rawTx = self.nodes[0].createrawtransaction(inputs, outputs) rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[0].fundrawtransaction(rawTx) fundedTx = self.nodes[0].fundrawtransaction(rawtx)
#create same transaction over sendtoaddress #create same transaction over sendtoaddress
txId = self.nodes[0].sendtoaddress(mSigObj, 11) txId = self.nodes[0].sendtoaddress(mSigObj, 11)
@ -402,8 +402,8 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = [] inputs = []
outputs = {mSigObj:11} outputs = {mSigObj:11}
rawTx = self.nodes[0].createrawtransaction(inputs, outputs) rawtx = self.nodes[0].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[0].fundrawtransaction(rawTx) fundedTx = self.nodes[0].fundrawtransaction(rawtx)
#create same transaction over sendtoaddress #create same transaction over sendtoaddress
txId = self.nodes[0].sendtoaddress(mSigObj, 11) txId = self.nodes[0].sendtoaddress(mSigObj, 11)
@ -437,8 +437,8 @@ class RawTransactionsTest(BitcoinTestFramework):
oldBalance = self.nodes[1].getbalance() oldBalance = self.nodes[1].getbalance()
inputs = [] inputs = []
outputs = {self.nodes[1].getnewaddress():11} outputs = {self.nodes[1].getnewaddress():11}
rawTx = self.nodes[2].createrawtransaction(inputs, outputs) rawtx = self.nodes[2].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[2].fundrawtransaction(rawTx) fundedTx = self.nodes[2].fundrawtransaction(rawtx)
signedTx = self.nodes[2].signrawtransaction(fundedTx['hex']) signedTx = self.nodes[2].signrawtransaction(fundedTx['hex'])
txId = self.nodes[2].sendrawtransaction(signedTx['hex']) txId = self.nodes[2].sendrawtransaction(signedTx['hex'])
@ -474,10 +474,10 @@ class RawTransactionsTest(BitcoinTestFramework):
self.nodes[1].getnewaddress() self.nodes[1].getnewaddress()
inputs = [] inputs = []
outputs = {self.nodes[0].getnewaddress():1.1} outputs = {self.nodes[0].getnewaddress():1.1}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs) rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
# fund a transaction that requires a new key for the change output # fund a transaction that requires a new key for the change output
# creating the key must be impossible because the wallet is locked # creating the key must be impossible because the wallet is locked
assert_raises_jsonrpc(-4, "Keypool ran out, please call keypoolrefill first", self.nodes[1].fundrawtransaction, rawTx) assert_raises_jsonrpc(-4, "Keypool ran out, please call keypoolrefill first", self.nodes[1].fundrawtransaction, rawtx)
#refill the keypool #refill the keypool
self.nodes[1].walletpassphrase("test", 100) self.nodes[1].walletpassphrase("test", 100)
@ -489,8 +489,8 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = [] inputs = []
outputs = {self.nodes[0].getnewaddress():11} outputs = {self.nodes[0].getnewaddress():11}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs) rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[1].fundrawtransaction(rawTx) fundedTx = self.nodes[1].fundrawtransaction(rawtx)
#now we need to unlock #now we need to unlock
self.nodes[1].walletpassphrase("test", 600) self.nodes[1].walletpassphrase("test", 600)
@ -520,8 +520,8 @@ class RawTransactionsTest(BitcoinTestFramework):
#fund a tx with ~20 small inputs #fund a tx with ~20 small inputs
inputs = [] inputs = []
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04} outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs) rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[1].fundrawtransaction(rawTx) fundedTx = self.nodes[1].fundrawtransaction(rawtx)
#create same transaction over sendtoaddress #create same transaction over sendtoaddress
txId = self.nodes[1].sendmany("", outputs) txId = self.nodes[1].sendmany("", outputs)
@ -552,8 +552,8 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = [] inputs = []
outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04} outputs = {self.nodes[0].getnewaddress():0.15,self.nodes[0].getnewaddress():0.04}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs) rawtx = self.nodes[1].createrawtransaction(inputs, outputs)
fundedTx = self.nodes[1].fundrawtransaction(rawTx) fundedTx = self.nodes[1].fundrawtransaction(rawtx)
fundedAndSignedTx = self.nodes[1].signrawtransaction(fundedTx['hex']) fundedAndSignedTx = self.nodes[1].signrawtransaction(fundedTx['hex'])
txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex']) txId = self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
self.sync_all() self.sync_all()