DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove unneeded semicolons

Browse Source
This commit is contained in:
Eirik Ogilvie-Wigley
2018-08-21 14:00:04 -06:00
parent f081d9cb02
commit 4d89d020a6
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qa/rpc-tests/mempool_tx_input_limit.py
View File

@@ -49,7 +49,7 @@ class MempoolTxInputLimitTest(BitcoinTestFramework):
node0_zaddr = self.nodes[0].z_getnewaddress() node0_zaddr = self.nodes[0].z_getnewaddress()
# Send three inputs from node 0 taddr to zaddr to get out of coinbase # Send three inputs from node 0 taddr to zaddr to get out of coinbase
node0_taddr = self.nodes[0].getnewaddress(); node0_taddr = self.nodes[0].getnewaddress()
recipients = [] recipients = []
recipients.append({"address":node0_zaddr, "amount":Decimal('30.0')-Decimal('0.0001')}) # utxo amount less fee recipients.append({"address":node0_zaddr, "amount":Decimal('30.0')-Decimal('0.0001')}) # utxo amount less fee
myopid = self.nodes[0].z_sendmany(node0_taddr, recipients) myopid = self.nodes[0].z_sendmany(node0_taddr, recipients)

14
qa/rpc-tests/test_framework/util.py
View File

@@ -76,13 +76,13 @@ def initialize_datadir(dirname, n):
if not os.path.isdir(datadir): if not os.path.isdir(datadir):
os.makedirs(datadir) os.makedirs(datadir)
with open(os.path.join(datadir, "zcash.conf"), 'w') as f: with open(os.path.join(datadir, "zcash.conf"), 'w') as f:
f.write("regtest=1\n"); f.write("regtest=1\n")
f.write("showmetrics=0\n"); f.write("showmetrics=0\n")
f.write("rpcuser=rt\n"); f.write("rpcuser=rt\n")
f.write("rpcpassword=rt\n"); f.write("rpcpassword=rt\n")
f.write("port="+str(p2p_port(n))+"\n"); f.write("port="+str(p2p_port(n))+"\n")
f.write("rpcport="+str(rpc_port(n))+"\n"); f.write("rpcport="+str(rpc_port(n))+"\n")
f.write("listenonion=0\n"); f.write("listenonion=0\n")
return datadir return datadir
def initialize_chain(test_dir): def initialize_chain(test_dir):

30
qa/rpc-tests/wallet.py
View File

@@ -220,7 +220,7 @@ class WalletTest (BitcoinTestFramework):
for uTx in unspentTxs: for uTx in unspentTxs:
if uTx['txid'] == zeroValueTxid: if uTx['txid'] == zeroValueTxid:
found = True found = True
assert_equal(uTx['amount'], Decimal('0.00000000')); assert_equal(uTx['amount'], Decimal('0.00000000'))
assert(found) assert(found)
#do some -walletbroadcast tests #do some -walletbroadcast tests
@@ -232,13 +232,13 @@ class WalletTest (BitcoinTestFramework):
connect_nodes_bi(self.nodes,0,2) connect_nodes_bi(self.nodes,0,2)
self.sync_all() self.sync_all()
txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2); txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2)
txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted) txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted)
self.sync_all() self.sync_all()
self.nodes[1].generate(1) #mine a block, tx should not be in there self.nodes[1].generate(1) #mine a block, tx should not be in there
self.sync_all() self.sync_all()
assert_equal(self.nodes[2].getbalance(), Decimal('9.99800000')); #should not be changed because tx was not broadcasted assert_equal(self.nodes[2].getbalance(), Decimal('9.99800000')) #should not be changed because tx was not broadcasted
assert_equal(self.nodes[2].getbalance("*"), Decimal('9.99800000')); #should not be changed because tx was not broadcasted assert_equal(self.nodes[2].getbalance("*"), Decimal('9.99800000')) #should not be changed because tx was not broadcasted
#now broadcast from another node, mine a block, sync, and check the balance #now broadcast from another node, mine a block, sync, and check the balance
self.nodes[1].sendrawtransaction(txObjNotBroadcasted['hex']) self.nodes[1].sendrawtransaction(txObjNotBroadcasted['hex'])
@@ -246,11 +246,11 @@ class WalletTest (BitcoinTestFramework):
self.nodes[1].generate(1) self.nodes[1].generate(1)
self.sync_all() self.sync_all()
txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted) txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted)
assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')); #should not be assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')) #should not be
assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')); #should not be assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')) #should not be
#create another tx #create another tx
txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2); txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2)
#restart the nodes with -walletbroadcast=1 #restart the nodes with -walletbroadcast=1
stop_nodes(self.nodes) stop_nodes(self.nodes)
@@ -265,18 +265,18 @@ class WalletTest (BitcoinTestFramework):
sync_blocks(self.nodes) sync_blocks(self.nodes)
#tx should be added to balance because after restarting the nodes tx should be broadcastet #tx should be added to balance because after restarting the nodes tx should be broadcastet
assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')); #should not be assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')) #should not be
assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')); #should not be assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')) #should not be
# send from node 0 to node 2 taddr # send from node 0 to node 2 taddr
mytaddr = self.nodes[2].getnewaddress(); mytaddr = self.nodes[2].getnewaddress()
mytxid = self.nodes[0].sendtoaddress(mytaddr, 10.0); mytxid = self.nodes[0].sendtoaddress(mytaddr, 10.0)
self.sync_all() self.sync_all()
self.nodes[0].generate(1) self.nodes[0].generate(1)
self.sync_all() self.sync_all()
mybalance = self.nodes[2].z_getbalance(mytaddr) mybalance = self.nodes[2].z_getbalance(mytaddr)
assert_equal(mybalance, Decimal('10.0')); assert_equal(mybalance, Decimal('10.0'))
mytxdetails = self.nodes[2].gettransaction(mytxid) mytxdetails = self.nodes[2].gettransaction(mytxid)
myvjoinsplits = mytxdetails["vjoinsplit"] myvjoinsplits = mytxdetails["vjoinsplit"]
@@ -365,7 +365,7 @@ class WalletTest (BitcoinTestFramework):
assert_equal(self.nodes[2].getbalance("*"), node2utxobalance) assert_equal(self.nodes[2].getbalance("*"), node2utxobalance)
# check zaddr balance # check zaddr balance
assert_equal(self.nodes[2].z_getbalance(myzaddr), zsendmanynotevalue); assert_equal(self.nodes[2].z_getbalance(myzaddr), zsendmanynotevalue)
# check via z_gettotalbalance # check via z_gettotalbalance
resp = self.nodes[2].z_gettotalbalance() resp = self.nodes[2].z_gettotalbalance()
@@ -428,7 +428,7 @@ class WalletTest (BitcoinTestFramework):
except JSONRPCException,e: except JSONRPCException,e:
errorString = e.error['message'] errorString = e.error['message']
assert_equal("Invalid amount" in errorString, True); assert_equal("Invalid amount" in errorString, True)
errorString = "" errorString = ""
try: try:
@@ -436,7 +436,7 @@ class WalletTest (BitcoinTestFramework):
except JSONRPCException,e: except JSONRPCException,e:
errorString = e.error['message'] errorString = e.error['message']
assert_equal("not an integer" in errorString, True); assert_equal("not an integer" in errorString, True)
myzaddr = self.nodes[0].z_getnewaddress() myzaddr = self.nodes[0].z_getnewaddress()
recipients = [ {"address": myzaddr, "amount": Decimal('0.0') } ] recipients = [ {"address": myzaddr, "amount": Decimal('0.0') } ]

4
qa/rpc-tests/wallet_nullifiers.py
View File

@@ -22,7 +22,7 @@ class WalletNullifiersTest (BitcoinTestFramework):
myzaddr0 = self.nodes[0].z_getnewaddress() myzaddr0 = self.nodes[0].z_getnewaddress()
# send node 0 taddr to zaddr to get out of coinbase # send node 0 taddr to zaddr to get out of coinbase
mytaddr = self.nodes[0].getnewaddress(); mytaddr = self.nodes[0].getnewaddress()
recipients = [] recipients = []
recipients.append({"address":myzaddr0, "amount":Decimal('10.0')-Decimal('0.0001')}) # utxo amount less fee recipients.append({"address":myzaddr0, "amount":Decimal('10.0')-Decimal('0.0001')}) # utxo amount less fee
@@ -94,7 +94,7 @@ class WalletNullifiersTest (BitcoinTestFramework):
# This requires that node 1 be unlocked, which triggers caching of # This requires that node 1 be unlocked, which triggers caching of
# uncached nullifiers. # uncached nullifiers.
self.nodes[1].walletpassphrase("test", 600) self.nodes[1].walletpassphrase("test", 600)
mytaddr1 = self.nodes[1].getnewaddress(); mytaddr1 = self.nodes[1].getnewaddress()
recipients = [] recipients = []
recipients.append({"address":mytaddr1, "amount":1.0}) recipients.append({"address":mytaddr1, "amount":1.0})