zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove semi colons

This commit is contained in:
mdr0id 2019-12-06 21:24:34 -08:00
parent 59068ea071
commit a9aa622359
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
qa/rpc-tests/fundrawtransaction.py
View File

@ -44,16 +44,16 @@ class RawTransactionsTest(BitcoinTestFramework):
watchonly_amount = 200 watchonly_amount = 200
self.nodes[3].importpubkey(watchonly_pubkey, "", True) self.nodes[3].importpubkey(watchonly_pubkey, "", True)
watchonly_txid = self.nodes[0].sendtoaddress(watchonly_address, watchonly_amount) watchonly_txid = self.nodes[0].sendtoaddress(watchonly_address, watchonly_amount)
self.nodes[0].sendtoaddress(self.nodes[3].getnewaddress(), watchonly_amount / 10); self.nodes[0].sendtoaddress(self.nodes[3].getnewaddress(), watchonly_amount / 10)
self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.5); self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.5)
self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.0); self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),1.0)
self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),5.0); self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(),5.0)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()
############### ###############
# simple test # # simple test #
############### ###############
@ -121,7 +121,7 @@ class RawTransactionsTest(BitcoinTestFramework):
for aUtx in listunspent: for aUtx in listunspent:
if aUtx['amount'] == 5.0: if aUtx['amount'] == 5.0:
utx = aUtx utx = aUtx
break; break
assert_equal(utx!=False, True) assert_equal(utx!=False, True)
@ -150,7 +150,7 @@ class RawTransactionsTest(BitcoinTestFramework):
for aUtx in listunspent: for aUtx in listunspent:
if aUtx['amount'] == 5.0: if aUtx['amount'] == 5.0:
utx = aUtx utx = aUtx
break; break
assert_equal(utx!=False, True) assert_equal(utx!=False, True)
@ -180,7 +180,7 @@ class RawTransactionsTest(BitcoinTestFramework):
for aUtx in listunspent: for aUtx in listunspent:
if aUtx['amount'] == 1.0: if aUtx['amount'] == 1.0:
utx = aUtx utx = aUtx
break; break
assert_equal(utx!=False, True) assert_equal(utx!=False, True)
@ -305,7 +305,7 @@ class RawTransactionsTest(BitcoinTestFramework):
except JSONRPCException as e: except JSONRPCException as e:
errorString = e.error['message'] errorString = e.error['message']
assert_equal("Insufficient" in errorString, True); assert_equal("Insufficient" in errorString, True)
@ -317,11 +317,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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(), 1.1); txId = self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 1.1)
signedFee = self.nodes[0].getrawmempool(True)[txId]['fee'] signedFee = self.nodes[0].getrawmempool(True)[txId]['fee']
#compare fee #compare fee
feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee); feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee)
assert(feeDelta >= 0 and feeDelta <= feeTolerance) assert(feeDelta >= 0 and feeDelta <= feeTolerance)
############################################################ ############################################################
@ -332,11 +332,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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']
#compare fee #compare fee
feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee); feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee)
assert(feeDelta >= 0 and feeDelta <= feeTolerance) assert(feeDelta >= 0 and feeDelta <= feeTolerance)
############################################################ ############################################################
@ -359,11 +359,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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, 1.1); txId = self.nodes[0].sendtoaddress(mSigObj, 1.1)
signedFee = self.nodes[0].getrawmempool(True)[txId]['fee'] signedFee = self.nodes[0].getrawmempool(True)[txId]['fee']
#compare fee #compare fee
feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee); feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee)
assert(feeDelta >= 0 and feeDelta <= feeTolerance) assert(feeDelta >= 0 and feeDelta <= feeTolerance)
############################################################ ############################################################
@ -392,11 +392,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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, 1.1); txId = self.nodes[0].sendtoaddress(mSigObj, 1.1)
signedFee = self.nodes[0].getrawmempool(True)[txId]['fee'] signedFee = self.nodes[0].getrawmempool(True)[txId]['fee']
#compare fee #compare fee
feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee); feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee)
assert(feeDelta >= 0 and feeDelta <= feeTolerance) assert(feeDelta >= 0 and feeDelta <= feeTolerance)
############################################################ ############################################################
@ -415,7 +415,7 @@ class RawTransactionsTest(BitcoinTestFramework):
# send 1.2 BTC to msig addr # send 1.2 BTC to msig addr
txId = self.nodes[0].sendtoaddress(mSigObj, 1.2); txId = self.nodes[0].sendtoaddress(mSigObj, 1.2)
self.sync_all() self.sync_all()
self.nodes[1].generate(1) self.nodes[1].generate(1)
self.sync_all() self.sync_all()
@ -453,7 +453,7 @@ class RawTransactionsTest(BitcoinTestFramework):
error = False error = False
try: try:
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.2); self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1.2)
except: except:
error = True error = True
assert(error) assert(error)
@ -483,13 +483,13 @@ class RawTransactionsTest(BitcoinTestFramework):
############################################### ###############################################
#empty node1, send some small coins from node0 to node1 #empty node1, send some small coins from node0 to node1
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True); self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()
for i in range(0,20): for i in range(0,20):
self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01); self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()
@ -501,11 +501,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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)
signedFee = self.nodes[1].getrawmempool(True)[txId]['fee'] signedFee = self.nodes[1].getrawmempool(True)[txId]['fee']
#compare fee #compare fee
feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee); feeDelta = Decimal(fundedTx['fee']) - Decimal(signedFee)
assert(feeDelta >= 0 and feeDelta <= feeTolerance*19) #~19 inputs assert(feeDelta >= 0 and feeDelta <= feeTolerance*19) #~19 inputs
@ -514,13 +514,13 @@ class RawTransactionsTest(BitcoinTestFramework):
############################################# #############################################
#again, empty node1, send some small coins from node0 to node1 #again, empty node1, send some small coins from node0 to node1
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True); self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()
for i in range(0,20): for i in range(0,20):
self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01); self.nodes[0].sendtoaddress(self.nodes[1].getnewaddress(), 0.01)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()