diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-05-10 20:59:36 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-10 20:59:46 -0400 |
commit | 81d0d565ab5551110ef465484b061922452aabe9 (patch) | |
tree | 8c8afd036878376b20abc7e5bbfa11d605acc575 /test/functional/feature_proxy.py | |
parent | cb9bbf77726a00c69a798ac818abda8281f61b43 (diff) | |
parent | 0d31ef4762f5a1428a57439d26551a99f15ddc2e (diff) | |
download | bitcoin-81d0d565ab5551110ef465484b061922452aabe9.tar.xz |
Merge #13210: Enable W191 indentation contains tabs and W291 trailing whitespace flake8 checks for Python files
0d31ef4762 Enable W191 and W291 flake8 checks. Remove trailing whitespace from Python files. Convert tabs to spaces. (John Bampton)
Pull request description:
Tree-SHA512: d062434310d6232469d7ca8e5f2ddb7db7e85cb2a299e609d98bacc318368e43e0777c9f4966df03d50f526bbe27207faa87a7464e62e14671194459a06ad969
Diffstat (limited to 'test/functional/feature_proxy.py')
-rwxr-xr-x | test/functional/feature_proxy.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index 60859de7a5..2d10c547e2 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -79,9 +79,9 @@ class ProxyTest(BitcoinTestFramework): # Note: proxies are not used to connect to local nodes # this is because the proxy to use is based on CService.GetNetwork(), which return NET_UNROUTABLE for localhost args = [ - ['-listen', '-proxy=%s:%i' % (self.conf1.addr),'-proxyrandomize=1'], - ['-listen', '-proxy=%s:%i' % (self.conf1.addr),'-onion=%s:%i' % (self.conf2.addr),'-proxyrandomize=0'], - ['-listen', '-proxy=%s:%i' % (self.conf2.addr),'-proxyrandomize=1'], + ['-listen', '-proxy=%s:%i' % (self.conf1.addr),'-proxyrandomize=1'], + ['-listen', '-proxy=%s:%i' % (self.conf1.addr),'-onion=%s:%i' % (self.conf2.addr),'-proxyrandomize=0'], + ['-listen', '-proxy=%s:%i' % (self.conf2.addr),'-proxyrandomize=1'], [] ] if self.have_ipv6: |