Minor Python cleanups to make flake8 pass with the new rules enabled
This commit is contained in:
parent
0d6992168c
commit
f020aca297
21 changed files with 58 additions and 50 deletions
|
@ -21,7 +21,8 @@ import argparse
|
||||||
import hashlib
|
import hashlib
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import json,codecs
|
import json
|
||||||
|
import codecs
|
||||||
try:
|
try:
|
||||||
from urllib.request import Request,urlopen
|
from urllib.request import Request,urlopen
|
||||||
except:
|
except:
|
||||||
|
|
|
@ -21,7 +21,6 @@ from binascii import hexlify, unhexlify
|
||||||
|
|
||||||
settings = {}
|
settings = {}
|
||||||
|
|
||||||
##### Switch endian-ness #####
|
|
||||||
def hex_switchEndian(s):
|
def hex_switchEndian(s):
|
||||||
""" Switches the endianness of a hex string (in pairs of hex chars) """
|
""" Switches the endianness of a hex string (in pairs of hex chars) """
|
||||||
pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
|
pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
|
||||||
|
|
|
@ -21,7 +21,6 @@ import os.path
|
||||||
|
|
||||||
settings = {}
|
settings = {}
|
||||||
|
|
||||||
##### Switch endian-ness #####
|
|
||||||
def hex_switchEndian(s):
|
def hex_switchEndian(s):
|
||||||
""" Switches the endianness of a hex string (in pairs of hex chars) """
|
""" Switches the endianness of a hex string (in pairs of hex chars) """
|
||||||
pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
|
pairList = [s[i:i+2].encode() for i in range(0, len(s), 2)]
|
||||||
|
|
|
@ -34,7 +34,8 @@ These should be pasted into `src/chainparamsseeds.h`.
|
||||||
|
|
||||||
from base64 import b32decode
|
from base64 import b32decode
|
||||||
from binascii import a2b_hex
|
from binascii import a2b_hex
|
||||||
import sys, os
|
import sys
|
||||||
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
||||||
# ipv4 in ipv6 prefix
|
# ipv4 in ipv6 prefix
|
||||||
|
@ -46,7 +47,7 @@ def name_to_ipv6(addr):
|
||||||
if len(addr)>6 and addr.endswith('.onion'):
|
if len(addr)>6 and addr.endswith('.onion'):
|
||||||
vchAddr = b32decode(addr[0:-6], True)
|
vchAddr = b32decode(addr[0:-6], True)
|
||||||
if len(vchAddr) != 16-len(pchOnionCat):
|
if len(vchAddr) != 16-len(pchOnionCat):
|
||||||
raise ValueError('Invalid onion %s' % s)
|
raise ValueError('Invalid onion %s' % vchAddr)
|
||||||
return pchOnionCat + vchAddr
|
return pchOnionCat + vchAddr
|
||||||
elif '.' in addr: # IPv4
|
elif '.' in addr: # IPv4
|
||||||
return pchIPv4 + bytearray((int(x) for x in addr.split('.')))
|
return pchIPv4 + bytearray((int(x) for x in addr.split('.')))
|
||||||
|
|
|
@ -6,6 +6,11 @@
|
||||||
# Generate seeds.txt from Pieter's DNS seeder
|
# Generate seeds.txt from Pieter's DNS seeder
|
||||||
#
|
#
|
||||||
|
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
import dns.resolver
|
||||||
|
import collections
|
||||||
|
|
||||||
NSEEDS=512
|
NSEEDS=512
|
||||||
|
|
||||||
MAX_SEEDS_PER_ASN=2
|
MAX_SEEDS_PER_ASN=2
|
||||||
|
@ -22,11 +27,6 @@ SUSPICIOUS_HOSTS = {
|
||||||
"54.94.195.96", "54.94.200.247"
|
"54.94.195.96", "54.94.200.247"
|
||||||
}
|
}
|
||||||
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
import dns.resolver
|
|
||||||
import collections
|
|
||||||
|
|
||||||
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
|
PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$")
|
||||||
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
|
PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$")
|
||||||
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
|
PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$")
|
||||||
|
|
|
@ -43,8 +43,10 @@ def b58encode(v):
|
||||||
# leading 0-bytes in the input become leading-1s
|
# leading 0-bytes in the input become leading-1s
|
||||||
nPad = 0
|
nPad = 0
|
||||||
for c in v:
|
for c in v:
|
||||||
if c == 0: nPad += 1
|
if c == 0:
|
||||||
else: break
|
nPad += 1
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
return (__b58chars[0]*nPad) + result
|
return (__b58chars[0]*nPad) + result
|
||||||
|
|
||||||
|
@ -98,7 +100,8 @@ def b58decode_chk(v):
|
||||||
def get_bcaddress_version(strAddress):
|
def get_bcaddress_version(strAddress):
|
||||||
""" Returns None if strAddress is invalid. Otherwise returns integer version of address. """
|
""" Returns None if strAddress is invalid. Otherwise returns integer version of address. """
|
||||||
addr = b58decode_chk(strAddress)
|
addr = b58decode_chk(strAddress)
|
||||||
if addr is None or len(addr)!=21: return None
|
if addr is None or len(addr)!=21:
|
||||||
|
return None
|
||||||
version = addr[0]
|
version = addr[0]
|
||||||
return ord(version)
|
return ord(version)
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,8 @@ def gen_invalid_vectors():
|
||||||
yield val,
|
yield val,
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
import sys, json
|
import sys
|
||||||
|
import json
|
||||||
iters = {'valid':gen_valid_vectors, 'invalid':gen_invalid_vectors}
|
iters = {'valid':gen_valid_vectors, 'invalid':gen_invalid_vectors}
|
||||||
try:
|
try:
|
||||||
uiter = iters[sys.argv[1]]
|
uiter = iters[sys.argv[1]]
|
||||||
|
|
|
@ -186,10 +186,10 @@ class RESTTest (BitcoinTestFramework):
|
||||||
self.test_rest_request("/getutxos/checkmempool", http_method='POST', req_type=ReqType.JSON, status=400, ret_type=RetType.OBJ)
|
self.test_rest_request("/getutxos/checkmempool", http_method='POST', req_type=ReqType.JSON, status=400, ret_type=RetType.OBJ)
|
||||||
|
|
||||||
# Test limits
|
# Test limits
|
||||||
long_uri = '/'.join(["{}-{}".format(txid, n) for n in range(20)])
|
long_uri = '/'.join(["{}-{}".format(txid, n_) for n_ in range(20)])
|
||||||
self.test_rest_request("/getutxos/checkmempool/{}".format(long_uri), http_method='POST', status=400, ret_type=RetType.OBJ)
|
self.test_rest_request("/getutxos/checkmempool/{}".format(long_uri), http_method='POST', status=400, ret_type=RetType.OBJ)
|
||||||
|
|
||||||
long_uri = '/'.join(['{}-{}'.format(txid, n) for n in range(15)])
|
long_uri = '/'.join(['{}-{}'.format(txid, n_) for n_ in range(15)])
|
||||||
self.test_rest_request("/getutxos/checkmempool/{}".format(long_uri), http_method='POST', status=200)
|
self.test_rest_request("/getutxos/checkmempool/{}".format(long_uri), http_method='POST', status=200)
|
||||||
|
|
||||||
self.nodes[0].generate(1) # generate block to not affect upcoming tests
|
self.nodes[0].generate(1) # generate block to not affect upcoming tests
|
||||||
|
|
|
@ -4,12 +4,14 @@
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
"""Dummy Socks5 server for testing."""
|
"""Dummy Socks5 server for testing."""
|
||||||
|
|
||||||
import socket, threading, queue
|
import socket
|
||||||
|
import threading
|
||||||
|
import queue
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
logger = logging.getLogger("TestFramework.socks5")
|
logger = logging.getLogger("TestFramework.socks5")
|
||||||
|
|
||||||
### Protocol constants
|
# Protocol constants
|
||||||
class Command:
|
class Command:
|
||||||
CONNECT = 0x01
|
CONNECT = 0x01
|
||||||
|
|
||||||
|
@ -18,7 +20,7 @@ class AddressType:
|
||||||
DOMAINNAME = 0x03
|
DOMAINNAME = 0x03
|
||||||
IPV6 = 0x04
|
IPV6 = 0x04
|
||||||
|
|
||||||
### Utility functions
|
# Utility functions
|
||||||
def recvall(s, n):
|
def recvall(s, n):
|
||||||
"""Receive n bytes from a socket, or fail."""
|
"""Receive n bytes from a socket, or fail."""
|
||||||
rv = bytearray()
|
rv = bytearray()
|
||||||
|
@ -30,7 +32,7 @@ def recvall(s, n):
|
||||||
n -= len(d)
|
n -= len(d)
|
||||||
return rv
|
return rv
|
||||||
|
|
||||||
### Implementation classes
|
# Implementation classes
|
||||||
class Socks5Configuration():
|
class Socks5Configuration():
|
||||||
"""Proxy configuration."""
|
"""Proxy configuration."""
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
|
|
@ -92,7 +92,8 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
# Node0's balance should be starting balance, plus 50BTC for another
|
# Node0's balance should be starting balance, plus 50BTC for another
|
||||||
# matured block, minus tx1 and tx2 amounts, and minus transaction fees:
|
# matured block, minus tx1 and tx2 amounts, and minus transaction fees:
|
||||||
expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"]
|
expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"]
|
||||||
if self.options.mine_block: expected += 50
|
if self.options.mine_block:
|
||||||
|
expected += 50
|
||||||
expected += tx1["amount"] + tx1["fee"]
|
expected += tx1["amount"] + tx1["fee"]
|
||||||
expected += tx2["amount"] + tx2["fee"]
|
expected += tx2["amount"] + tx2["fee"]
|
||||||
assert_equal(self.nodes[0].getbalance(), expected)
|
assert_equal(self.nodes[0].getbalance(), expected)
|
||||||
|
|
|
@ -76,7 +76,8 @@ class TxnMallTest(BitcoinTestFramework):
|
||||||
# Node0's balance should be starting balance, plus 50BTC for another
|
# Node0's balance should be starting balance, plus 50BTC for another
|
||||||
# matured block, minus 40, minus 20, and minus transaction fees:
|
# matured block, minus 40, minus 20, and minus transaction fees:
|
||||||
expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"]
|
expected = starting_balance + fund_foo_tx["fee"] + fund_bar_tx["fee"]
|
||||||
if self.options.mine_block: expected += 50
|
if self.options.mine_block:
|
||||||
|
expected += 50
|
||||||
expected += tx1["amount"] + tx1["fee"]
|
expected += tx1["amount"] + tx1["fee"]
|
||||||
expected += tx2["amount"] + tx2["fee"]
|
expected += tx2["amount"] + tx2["fee"]
|
||||||
assert_equal(self.nodes[0].getbalance(), expected)
|
assert_equal(self.nodes[0].getbalance(), expected)
|
||||||
|
|
Loading…
Reference in a new issue