Browse Source

Merge #10107: Remove unused variable. Remove accidental trailing semicolons in Python code

85de9d4 Remove call to gettransaction(...) where the result is unused (practicalswift)
bd02422 Remove accidental trailing semicolons in Python code (practicalswift)

Tree-SHA512: 23ffb1ccc29bf73b334d62b274ab614cb40e2969147adccacbaecc69a410a661a9f2dd9e9cbc8a70bd2c7f345095efc68743f288eb866315e0e8731441ba01d0
0.15
MarcoFalke 8 years ago
parent
commit
f2734c2828
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
  1. 2
      contrib/zmq/zmq_sub3.4.py
  2. 1
      test/functional/bumpfee.py
  3. 2
      test/functional/importmulti.py

2
contrib/zmq/zmq_sub3.4.py

@ -57,7 +57,7 @@ class ZMQHandler(): @@ -57,7 +57,7 @@ class ZMQHandler():
msg = yield from self.zmqSubSocket.recv_multipart()
topic = msg[0]
body = msg[1]
sequence = "Unknown";
sequence = "Unknown"
if len(msg[-1]) == 4:
msgSequence = struct.unpack('<I', msg[-1])[-1]
sequence = str(msgSequence)

1
test/functional/bumpfee.py

@ -196,7 +196,6 @@ def test_dust_to_fee(rbf_node, dest_address): @@ -196,7 +196,6 @@ def test_dust_to_fee(rbf_node, dest_address):
def test_settxfee(rbf_node, dest_address):
# check that bumpfee reacts correctly to the use of settxfee (paytxfee)
rbfid = spend_one_input(rbf_node, dest_address)
rbftx = rbf_node.gettransaction(rbfid)
requested_feerate = Decimal("0.00025000")
rbf_node.settxfee(requested_feerate)
bumped_tx = rbf_node.bumpfee(rbfid)

2
test/functional/importmulti.py

@ -434,7 +434,7 @@ class ImportMultiTest (BitcoinTestFramework): @@ -434,7 +434,7 @@ class ImportMultiTest (BitcoinTestFramework):
address_assert = self.nodes[1].validateaddress(watchonly_address)
assert_equal(address_assert['iswatchonly'], True)
assert_equal(address_assert['ismine'], False)
assert_equal(address_assert['timestamp'], watchonly_timestamp);
assert_equal(address_assert['timestamp'], watchonly_timestamp)
# Bad or missing timestamps
self.log.info("Should throw on invalid or missing timestamp values")

Loading…
Cancel
Save