clean up conventions and whitespace

This commit is contained in:
mdr0id 2020-02-09 08:44:23 -08:00
parent 8f859cbf85
commit 9592ded3cc
3 changed files with 6 additions and 7 deletions

View File

@ -85,8 +85,7 @@ class AuthServiceProxy():
self.__conn = connection
self.timeout = connection.timeout
elif self.__url.scheme == 'https':
self.__conn = HTTPSConnection(self.__url.hostname, port,
timeout=self.timeout)
self.__conn = HTTPSConnection(self.__url.hostname, port, timeout=self.timeout)
else:
self.__conn = HTTPConnection(self.__url.hostname, port, timeout=self.timeout)
@ -97,7 +96,7 @@ class AuthServiceProxy():
if self.__service_name is not None:
name = "%s.%s" % (self.__service_name, name)
return AuthServiceProxy(self.__service_url, name, connection=self.__conn)
def _request(self, method, path, postdata):
'''
Do a HTTP request, with retry if we get disconnected (e.g. due to a timeout).

View File

@ -40,9 +40,9 @@ class CScriptOp(int):
def encode_op_pushdata(d):
"""Encode a PUSHDATA op, returning bytes"""
if len(d) < 0x4c:
return b'' + struct.pack(b'B', len(d)) + d # OP_PUSHDATA
return b'' + struct.pack('B', len(d)) + d # OP_PUSHDATA
elif len(d) <= 0xff:
return b'\x4c' + struct.pack(b'B', len(d)) + d # OP_PUSHDATA1
return b'\x4c' + struct.pack('B', len(d)) + d # OP_PUSHDATA1
elif len(d) <= 0xffff:
return b'\x4d' + struct.pack(b'<H', len(d)) + d # OP_PUSHDATA2
elif len(d) <= 0xffffffff:
@ -631,7 +631,7 @@ class CScriptNum(object):
r.append(0x80 if neg else 0)
elif neg:
r[-1] |= 0x80
return struct.pack("<B",len(r)) + r
return struct.pack("B", len(r)) + r
class CScript(bytes):

View File

@ -36,7 +36,7 @@ class WalletChangeAddressesTest(BitcoinTestFramework):
def run_test(self):
self.nodes[0].generate(110)
# Obtain some transparent funds
midAddr = self.nodes[0].z_getnewaddress('sapling')
myopid = self.nodes[0].z_shieldcoinbase(get_coinbase_address(self.nodes[0]), midAddr, 0)['opid']