highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 22:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #21107: test: remove type: comments in favour of actual annotations

Browse Source 
9913419cc9 test: remove type: comments in favour of actual annotations (fanquake)

Pull request description:

  Now that we require Python 3.6+, we should be using variable type
  annotations directly rather than `# type:` comments.

  Also takes care of the discarded value issue in p2p_message_capture.py.
  See: https://github.com/bitcoin/bitcoin/pull/19509/files#r571674446.

ACKs for top commit:
  MarcoFalke:
    review ACK 9913419cc9
  jnewbery:
    Code review ACK 9913419cc9

Tree-SHA512: 63aba5eef6c1320578f66cf8a6d85ac9dbab9d30b0d21e6e966be8216e63606de12321320c2958c67933bf68d10f2e76e9c43928e5989614cea34dde4187aad8
This commit is contained in:
MarcoFalke
2021-02-08 10:56:48 +01:00
parent ca85449f22 9913419cc9
commit b401b09355
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/data/invalid_txs.py
View File

@@ -57,7 +57,7 @@ class BadTxTemplate:
__metaclass__ = abc.ABCMeta __metaclass__ = abc.ABCMeta
# The expected error code given by bitcoind upon submission of the tx. # The expected error code given by bitcoind upon submission of the tx.
reject_reason = "" # type: Optional[str] reject_reason: Optional[str] = ""
# Only specified if it differs from mempool acceptance error. # Only specified if it differs from mempool acceptance error.
block_reject_reason = "" block_reject_reason = ""

6
test/functional/p2p_message_capture.py
View File

@@ -42,14 +42,14 @@ def mini_parser(dat_file):
if not tmp_header_raw: if not tmp_header_raw:
break break
tmp_header = BytesIO(tmp_header_raw) tmp_header = BytesIO(tmp_header_raw)
int.from_bytes(tmp_header.read(TIME_SIZE), "little") # type: int tmp_header.read(TIME_SIZE) # skip the timestamp field
raw_msgtype = tmp_header.read(MSGTYPE_SIZE) raw_msgtype = tmp_header.read(MSGTYPE_SIZE)
msgtype = raw_msgtype.split(b'\x00', 1)[0] # type: bytes msgtype: bytes = raw_msgtype.split(b'\x00', 1)[0]
remainder = raw_msgtype.split(b'\x00', 1)[1] remainder = raw_msgtype.split(b'\x00', 1)[1]
assert(len(msgtype) > 0) assert(len(msgtype) > 0)
assert(msgtype in MESSAGEMAP) assert(msgtype in MESSAGEMAP)
assert(len(remainder) == 0 or not remainder.decode().isprintable()) assert(len(remainder) == 0 or not remainder.decode().isprintable())
length = int.from_bytes(tmp_header.read(LENGTH_SIZE), "little") # type: int length: int = int.from_bytes(tmp_header.read(LENGTH_SIZE), "little")
data = f_in.read(length) data = f_in.read(length)
assert_equal(len(data), length) assert_equal(len(data), length)

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

@@ -29,8 +29,6 @@ MAX_SCRIPT_ELEMENT_SIZE = 520
LOCKTIME_THRESHOLD = 500000000 LOCKTIME_THRESHOLD = 500000000
ANNEX_TAG = 0x50 ANNEX_TAG = 0x50
OPCODE_NAMES = {} # type: Dict[CScriptOp, str]
LEAF_VERSION_TAPSCRIPT = 0xc0 LEAF_VERSION_TAPSCRIPT = 0xc0
def hash160(s): def hash160(s):
@@ -47,7 +45,6 @@ def bn2vch(v):
# Serialize to bytes # Serialize to bytes
return encoded_v.to_bytes(n_bytes, 'little') return encoded_v.to_bytes(n_bytes, 'little')
_opcode_instances = [] # type: List[CScriptOp]
class CScriptOp(int): class CScriptOp(int):
"""A single script opcode""" """A single script opcode"""
__slots__ = () __slots__ = ()
@@ -111,6 +108,9 @@ class CScriptOp(int):
_opcode_instances.append(super().__new__(cls, n)) _opcode_instances.append(super().__new__(cls, n))
return _opcode_instances[n] return _opcode_instances[n]
OPCODE_NAMES: Dict[CScriptOp, str] = {}
_opcode_instances: List[CScriptOp] = []
# Populate opcode instance table # Populate opcode instance table
for n in range(0xff + 1): for n in range(0xff + 1):
CScriptOp(n) CScriptOp(n)