diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-03-29 11:16:42 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-03-29 11:16:48 +0200 |
| commit | f2734c2828f69d9cfd535e5eab0592a7674b2b61 (patch) | |
| tree | 156453bc42cf9a66b77c0ca2eb709f8873ecd0dd /test/functional | |
| parent | 9692be4a9a9b0e2959cf0352b83a1898f4a7675e (diff) | |
| parent | 85de9d474b13a0e6ad681848e5497d02e00dd644 (diff) | |
| download | bitcoin-f2734c2828f69d9cfd535e5eab0592a7674b2b61.tar.xz | |
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
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/bumpfee.py | 1 | ||||
| -rwxr-xr-x | test/functional/importmulti.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/functional/bumpfee.py b/test/functional/bumpfee.py index 172e414188..c51a75cc26 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 aa03c6780a..e049302632 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") |