diff options
| author | MarcoFalke <[email protected]> | 2017-03-29 11:16:42 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2017-03-29 11:16:48 +0200 |
| commit | f2734c2828f69d9cfd535e5eab0592a7674b2b61 (patch) | |
| tree | 156453bc42cf9a66b77c0ca2eb709f8873ecd0dd | |
| parent | Merge #10084: rpc: Rename first named arg of createrawtransaction (diff) | |
| parent | Remove call to gettransaction(...) where the result is unused (diff) | |
| download | discoin-f2734c2828f69d9cfd535e5eab0592a7674b2b61.tar.xz discoin-f2734c2828f69d9cfd535e5eab0592a7674b2b61.zip | |
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
| -rwxr-xr-x | contrib/zmq/zmq_sub3.4.py | 2 | ||||
| -rwxr-xr-x | test/functional/bumpfee.py | 1 | ||||
| -rwxr-xr-x | test/functional/importmulti.py | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/contrib/zmq/zmq_sub3.4.py b/contrib/zmq/zmq_sub3.4.py index a2ff64b29..1cb7eec0c 100755 --- a/contrib/zmq/zmq_sub3.4.py +++ b/contrib/zmq/zmq_sub3.4.py @@ -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) diff --git a/test/functional/bumpfee.py b/test/functional/bumpfee.py index 172e41418..c51a75cc2 100755 --- a/test/functional/bumpfee.py +++ b/test/functional/bumpfee.py @@ -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) diff --git a/test/functional/importmulti.py b/test/functional/importmulti.py index aa03c6780..e04930263 100755 --- a/test/functional/importmulti.py +++ b/test/functional/importmulti.py @@ -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") |