aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2017-05-02 20:50:57 +0200
committerMarcoFalke <falke.marco@gmail.com>2017-05-02 20:51:16 +0200
commit75171f099e82e3527d7c3469b15891bd92227ec2 (patch)
tree7e23772b8e83091ae18f3b4b16816b6eb2b5a38d /test
parent3c5e6c94caf40395e031fbde44a0cca46fdd76ec (diff)
parent73b37219d40d5d1f729aa552ba8c0bc12f5bf6f4 (diff)
downloadbitcoin-75171f099e82e3527d7c3469b15891bd92227ec2.tar.xz
Merge #10137: Remove unused import. Remove accidental trailing semicolons.
73b3721 Remove accidental trailing semicolons (practicalswift) b8d9a86 Remove unused import (practicalswift) Tree-SHA512: 36ac38952f8a10f36d2300519c583ef77703cff761be97470be97cfda2fec9d5b7ac604e454f174cc2601160e5cef3f227021ab5d3a6febc97fcb486d78754d3
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/bip9-softforks.py1
-rwxr-xr-xtest/functional/p2p-versionbits-warning.py1
-rwxr-xr-xtest/functional/wallet-hd.py6
3 files changed, 3 insertions, 5 deletions
diff --git a/test/functional/bip9-softforks.py b/test/functional/bip9-softforks.py
index 782eab3cc4..1b2dff63d2 100755
--- a/test/functional/bip9-softforks.py
+++ b/test/functional/bip9-softforks.py
@@ -16,7 +16,6 @@ test that enforcement has not triggered (which triggers ACTIVE)
test that enforcement has triggered
"""
-from test_framework.blockstore import BlockStore
from test_framework.test_framework import ComparisonTestFramework
from test_framework.util import *
from test_framework.mininode import CTransaction, NetworkThread
diff --git a/test/functional/p2p-versionbits-warning.py b/test/functional/p2p-versionbits-warning.py
index 7254017e60..41921fe14e 100755
--- a/test/functional/p2p-versionbits-warning.py
+++ b/test/functional/p2p-versionbits-warning.py
@@ -12,7 +12,6 @@ from test_framework.mininode import *
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import *
import re
-import time
from test_framework.blocktools import create_block, create_coinbase
VB_PERIOD = 144 # versionbits period length for regtest
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py
index 4ad458f3ef..bbf53e7dba 100755
--- a/test/functional/wallet-hd.py
+++ b/test/functional/wallet-hd.py
@@ -39,7 +39,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key
change_addr = self.nodes[1].getrawchangeaddress()
- change_addrV= self.nodes[1].validateaddress(change_addr);
+ change_addrV= self.nodes[1].validateaddress(change_addr)
assert_equal(change_addrV["hdkeypath"], "m/0'/1'/0'") #first internal child key
# Import a non-HD private key in the HD wallet
@@ -67,7 +67,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key (again)
change_addr = self.nodes[1].getrawchangeaddress()
- change_addrV= self.nodes[1].validateaddress(change_addr);
+ change_addrV= self.nodes[1].validateaddress(change_addr)
assert_equal(change_addrV["hdkeypath"], "m/0'/1'/1'") #second internal child key
self.sync_all()
@@ -97,7 +97,7 @@ class WalletHDTest(BitcoinTestFramework):
# send a tx and make sure its using the internal chain for the changeoutput
txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
- outs = self.nodes[1].decoderawtransaction(self.nodes[1].gettransaction(txid)['hex'])['vout'];
+ outs = self.nodes[1].decoderawtransaction(self.nodes[1].gettransaction(txid)['hex'])['vout']
keypath = ""
for out in outs:
if out['value'] != 1: