From b8d9a86dc398846fdc91eb6a76fd119faf274fe2 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Sun, 2 Apr 2017 01:28:26 +0200 Subject: [PATCH 1/2] Remove unused import --- test/functional/bip9-softforks.py | 1 - test/functional/net.py | 2 -- test/functional/p2p-versionbits-warning.py | 1 - 3 files changed, 4 deletions(-) diff --git a/test/functional/bip9-softforks.py b/test/functional/bip9-softforks.py index 60d262da8..a6383c067 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/net.py b/test/functional/net.py index e9463c7dc..b4ad820e8 100755 --- a/test/functional/net.py +++ b/test/functional/net.py @@ -7,11 +7,9 @@ Tests correspond to code in rpc/net.cpp. """ -from decimal import Decimal import time from test_framework.test_framework import BitcoinTestFramework -from test_framework.authproxy import JSONRPCException from test_framework.util import ( assert_equal, start_nodes, diff --git a/test/functional/p2p-versionbits-warning.py b/test/functional/p2p-versionbits-warning.py index da960e2d8..cdf3b8487 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 From 73b37219d40d5d1f729aa552ba8c0bc12f5bf6f4 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Sun, 2 Apr 2017 01:29:14 +0200 Subject: [PATCH 2/2] Remove accidental trailing semicolons --- test/functional/wallet-hd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py index 64a6c9278..f29b87519 100755 --- a/test/functional/wallet-hd.py +++ b/test/functional/wallet-hd.py @@ -44,7 +44,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 @@ -72,7 +72,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() @@ -102,7 +102,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: