LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #12996: tests: Remove redundant bytes(…) calls

Browse source 
9db48c5634 tests: Remove redundant bytes² (practicalswift)

Pull request description:

  This is a follow-up to #12993. As @jnewbery noted `bytes()` is idempotent.

Tree-SHA512: 0eb25e0c2c46f9abaac30f964c5eb422bece1414c840a717d86794424294cb19d995a6db7c8df2a2f4ec84776b05274a637f2c111738f397051f510e57184752
This commit is contained in:
MarcoFalke 2018-04-16 11:53:56 -04:00
commit 6a278e0640
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/functional/test_framework/script.py
View file

@ -379,7 +379,7 @@ class CScriptNum():
r.append(0x80 if neg else 0) r.append(0x80 if neg else 0)
elif neg: elif neg:
r[-1] |= 0x80 r[-1] |= 0x80
return bytes(bytes([len(r)]) + r) return bytes([len(r)]) + r
class CScript(bytes): class CScript(bytes):
@ -404,9 +404,9 @@ class CScript(bytes):
other = CScriptNum.encode(other) other = CScriptNum.encode(other)
elif isinstance(other, int): elif isinstance(other, int):
if 0 <= other <= 16: if 0 <= other <= 16:
other = bytes(bytes([CScriptOp.encode_op_n(other)])) other = bytes([CScriptOp.encode_op_n(other)])
elif other == -1: elif other == -1:
other = bytes(bytes([OP_1NEGATE])) other = bytes([OP_1NEGATE])
else: else:
other = CScriptOp.encode_op_pushdata(bn2vch(other)) other = CScriptOp.encode_op_pushdata(bn2vch(other))
elif isinstance(other, (bytes, bytearray)): elif isinstance(other, (bytes, bytearray)):