LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

qa: Style-only fixes in touched files

Browse source
This commit is contained in:
MarcoFalke 2019-01-25 11:34:39 -05:00
parent 003a47f804
commit fa2198328e
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
test/functional/wallet_abandonconflict.py
View file

@ -13,7 +13,15 @@
from decimal import Decimal from decimal import Decimal
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, assert_raises_rpc_error, connect_nodes, disconnect_nodes, sync_blocks, sync_mempools from test_framework.util import (
assert_equal,
assert_raises_rpc_error,
connect_nodes,
disconnect_nodes,
sync_blocks,
sync_mempools,
)
class AbandonConflictTest(BitcoinTestFramework): class AbandonConflictTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
@ -40,7 +48,7 @@ class AbandonConflictTest(BitcoinTestFramework):
sync_blocks(self.nodes) sync_blocks(self.nodes)
newbalance = self.nodes[0].getbalance() newbalance = self.nodes[0].getbalance()
assert(balance - newbalance < Decimal("0.001")) #no more than fees lost assert balance - newbalance < Decimal("0.001") #no more than fees lost
balance = newbalance balance = newbalance
# Disconnect nodes so node0's transactions don't get into node1's mempool # Disconnect nodes so node0's transactions don't get into node1's mempool
@ -51,10 +59,10 @@ class AbandonConflictTest(BitcoinTestFramework):
nB = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txB, 1)["vout"]) if vout["value"] == Decimal("10")) nB = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txB, 1)["vout"]) if vout["value"] == Decimal("10"))
nC = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txC, 1)["vout"]) if vout["value"] == Decimal("10")) nC = next(i for i, vout in enumerate(self.nodes[0].getrawtransaction(txC, 1)["vout"]) if vout["value"] == Decimal("10"))
inputs =[] inputs = []
# spend 10btc outputs from txA and txB # spend 10btc outputs from txA and txB
inputs.append({"txid":txA, "vout":nA}) inputs.append({"txid": txA, "vout": nA})
inputs.append({"txid":txB, "vout":nB}) inputs.append({"txid": txB, "vout": nB})
outputs = {} outputs = {}
outputs[self.nodes[0].getnewaddress()] = Decimal("14.99998") outputs[self.nodes[0].getnewaddress()] = Decimal("14.99998")
@ -67,8 +75,8 @@ class AbandonConflictTest(BitcoinTestFramework):
#Create a child tx spending AB1 and C #Create a child tx spending AB1 and C
inputs = [] inputs = []
inputs.append({"txid":txAB1, "vout":nAB}) inputs.append({"txid": txAB1, "vout": nAB})
inputs.append({"txid":txC, "vout":nC}) inputs.append({"txid": txC, "vout": nC})
outputs = {} outputs = {}
outputs[self.nodes[0].getnewaddress()] = Decimal("24.9996") outputs[self.nodes[0].getnewaddress()] = Decimal("24.9996")
signed2 = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs)) signed2 = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs))
@ -76,8 +84,8 @@ class AbandonConflictTest(BitcoinTestFramework):
# Create a child tx spending ABC2 # Create a child tx spending ABC2
signed3_change = Decimal("24.999") signed3_change = Decimal("24.999")
inputs = [ {"txid":txABC2, "vout":0} ] inputs = [{"txid": txABC2, "vout": 0}]
outputs = { self.nodes[0].getnewaddress(): signed3_change } outputs = {self.nodes[0].getnewaddress(): signed3_change}
signed3 = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs)) signed3 = self.nodes[0].signrawtransactionwithwallet(self.nodes[0].createrawtransaction(inputs, outputs))
# note tx is never directly referenced, only abandoned as a child of the above # note tx is never directly referenced, only abandoned as a child of the above
self.nodes[0].sendrawtransaction(signed3["hex"]) self.nodes[0].sendrawtransaction(signed3["hex"])
@ -105,7 +113,7 @@ class AbandonConflictTest(BitcoinTestFramework):
unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance() unconfbalance = self.nodes[0].getunconfirmedbalance() + self.nodes[0].getbalance()
assert_equal(unconfbalance, newbalance) assert_equal(unconfbalance, newbalance)
# Also shouldn't show up in listunspent # Also shouldn't show up in listunspent
assert(not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)]) assert not txABC2 in [utxo["txid"] for utxo in self.nodes[0].listunspent(0)]
balance = newbalance balance = newbalance
# Abandon original transaction and verify inputs are available again # Abandon original transaction and verify inputs are available again
@ -145,8 +153,8 @@ class AbandonConflictTest(BitcoinTestFramework):
# Create a double spend of AB1 by spending again from only A's 10 output # Create a double spend of AB1 by spending again from only A's 10 output
# Mine double spend from node 1 # Mine double spend from node 1
inputs =[] inputs = []
inputs.append({"txid":txA, "vout":nA}) inputs.append({"txid": txA, "vout": nA})
outputs = {} outputs = {}
outputs[self.nodes[1].getnewaddress()] = Decimal("9.9999") outputs[self.nodes[1].getnewaddress()] = Decimal("9.9999")
tx = self.nodes[0].createrawtransaction(inputs, outputs) tx = self.nodes[0].createrawtransaction(inputs, outputs)
@ -172,5 +180,6 @@ class AbandonConflictTest(BitcoinTestFramework):
self.log.info("conflicted has not resumed causing its inputs to be seen as spent. See Issue #7315") self.log.info("conflicted has not resumed causing its inputs to be seen as spent. See Issue #7315")
self.log.info(str(balance) + " -> " + str(newbalance) + " ?") self.log.info(str(balance) + " -> " + str(newbalance) + " ?")
if __name__ == '__main__': if __name__ == '__main__':
AbandonConflictTest().main() AbandonConflictTest().main()

14
test/functional/wallet_basic.py
View file

@ -19,6 +19,7 @@ from test_framework.util import (
wait_until, wait_until,
) )
class WalletTest(BitcoinTestFramework): class WalletTest(BitcoinTestFramework):
def set_test_params(self): def set_test_params(self):
self.num_nodes = 4 self.num_nodes = 4
@ -237,7 +238,7 @@ class WalletTest(BitcoinTestFramework):
assert_equal(set(relayed), {txid1, txid2}) assert_equal(set(relayed), {txid1, txid2})
sync_mempools(self.nodes) sync_mempools(self.nodes)
assert(txid1 in self.nodes[3].getrawmempool()) assert txid1 in self.nodes[3].getrawmempool()
# check if we can list zero value tx as available coins # check if we can list zero value tx as available coins
# 1. create raw_tx # 1. create raw_tx
@ -264,7 +265,7 @@ class WalletTest(BitcoinTestFramework):
if uTx['txid'] == zero_value_txid: if uTx['txid'] == zero_value_txid:
found = True found = True
assert_equal(uTx['amount'], Decimal('0')) assert_equal(uTx['amount'], Decimal('0'))
assert(found) assert found
# do some -walletbroadcast tests # do some -walletbroadcast tests
self.stop_nodes() self.stop_nodes()
@ -341,7 +342,7 @@ class WalletTest(BitcoinTestFramework):
self.nodes[1].importaddress(address_to_import) self.nodes[1].importaddress(address_to_import)
# 3. Validate that the imported address is watch-only on node1 # 3. Validate that the imported address is watch-only on node1
assert(self.nodes[1].getaddressinfo(address_to_import)["iswatchonly"]) assert self.nodes[1].getaddressinfo(address_to_import)["iswatchonly"]
# 4. Check that the unspents after import are not spendable # 4. Check that the unspents after import are not spendable
assert_array_result(self.nodes[1].listunspent(), assert_array_result(self.nodes[1].listunspent(),
@ -383,7 +384,7 @@ class WalletTest(BitcoinTestFramework):
addr = self.nodes[0].getnewaddress() addr = self.nodes[0].getnewaddress()
self.nodes[0].setlabel(addr, label) self.nodes[0].setlabel(addr, label)
assert_equal(self.nodes[0].getaddressinfo(addr)['label'], label) assert_equal(self.nodes[0].getaddressinfo(addr)['label'], label)
assert(label in self.nodes[0].listlabels()) assert label in self.nodes[0].listlabels()
self.nodes[0].rpc.ensure_ascii = True # restore to default self.nodes[0].rpc.ensure_ascii = True # restore to default
# maintenance tests # maintenance tests
@ -442,8 +443,8 @@ class WalletTest(BitcoinTestFramework):
# Without walletrejectlongchains, we will still generate a txid # Without walletrejectlongchains, we will still generate a txid
# The tx will be stored in the wallet but not accepted to the mempool # The tx will be stored in the wallet but not accepted to the mempool
extra_txid = self.nodes[0].sendtoaddress(sending_addr, Decimal('0.0001')) extra_txid = self.nodes[0].sendtoaddress(sending_addr, Decimal('0.0001'))
assert(extra_txid not in self.nodes[0].getrawmempool()) assert extra_txid not in self.nodes[0].getrawmempool()
assert(extra_txid in [tx["txid"] for tx in self.nodes[0].listtransactions()]) assert extra_txid in [tx["txid"] for tx in self.nodes[0].listtransactions()]
self.nodes[0].abandontransaction(extra_txid) self.nodes[0].abandontransaction(extra_txid)
total_txs = len(self.nodes[0].listtransactions("*", 99999)) total_txs = len(self.nodes[0].listtransactions("*", 99999))
@ -491,5 +492,6 @@ class WalletTest(BitcoinTestFramework):
self.nodes[0].setlabel(change, 'foobar') self.nodes[0].setlabel(change, 'foobar')
assert_equal(self.nodes[0].getaddressinfo(change)['ischange'], False) assert_equal(self.nodes[0].getaddressinfo(change)['ischange'], False)
if __name__ == '__main__': if __name__ == '__main__':
WalletTest().main() WalletTest().main()