Minor Python cleanups to make flake8 pass with the new rules enabled
This commit is contained in:
1 parent
0d6992168c
commit
f020aca297
21 files changed
+58
-50
No files matched your search
@@ -27,7 +27,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
for i in range(4):
|
||||
assert_equal(self.nodes[i].getbalance(), starting_balance)
|
||||
self.nodes[i].getnewaddress("") # bug workaround, coins generated assigned to first getnewaddress!
|
||||
|
||||
|
||||
# Assign coins to foo and bar accounts:
|
||||
node0_address_foo = self.nodes[0].getnewaddress("foo")
|
||||
fund_foo_txid = self.nodes[0].sendfrom("", node0_address_foo, 1219)
|
||||
@@ -64,7 +64,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
# Create two spends using 1 50 BTC coin each
|
||||
txid1 = self.nodes[0].sendfrom("foo", node1_address, 40, 0)
|
||||
txid2 = self.nodes[0].sendfrom("bar", node1_address, 20, 0)
|
||||
|
||||
|
||||
# Have node0 mine a block:
|
||||
if (self.options.mine_block):
|
||||
self.nodes[0].generate(1)
|
||||
@@ -76,7 +76,8 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
# Node0's balance should be starting balance, plus 50BTC for another
|
||||
# matured block, minus 40, minus 20, and minus transaction fees:
|
||||
expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"]
|
||||
if self.options.mine_block: expected += 50
|
||||
if self.options.mine_block:
|
||||
expected += 50
|
||||
expected += tx1["amount"] + tx1["fee"]
|
||||
expected += tx2["amount"] + tx2["fee"]
|
||||
assert_equal(self.nodes[0].getbalance(), expected)
|
||||
@@ -93,7 +94,7 @@ class TxnMallTest(BitcoinTestFramework):
|
||||
else:
|
||||
assert_equal(tx1["confirmations"], 0)
|
||||
assert_equal(tx2["confirmations"], 0)
|
||||
|
||||
|
||||
# Now give doublespend and its parents to miner:
|
||||
self.nodes[2].sendrawtransaction(fund_foo_tx["hex"])
|
||||
self.nodes[2].sendrawtransaction(fund_bar_tx["hex"])
|
||||
|
||||
Reference in new issue
Block a user