Merge #19897: Change FILE_CHAR_BLOCKLIST to FILE_CHARS_DISALLOWED

637d8bce741213295bd9b9d1982cae663c701ba1 Change FILE_CHAR_BLOCKLIST to FILE_CHARS_DISALLOWED (Benoit Verret)

Pull request description:

  Blocklist is ambiguous. It could mean a list of blocks.

  Example: "blocknotify" in the same file refers to Bitcoin blocks.

ACKs for top commit:
  MarcoFalke:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1
  laanwj:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1 — this is a clear variable name improvement
  theStack:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1
  jonatack:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1
  eriknylund:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1
  promag:
    ACK 637d8bce741213295bd9b9d1982cae663c701ba1.

Tree-SHA512: 028e7102eeaf61105736c55c119a7f5c05411f2b6715a7939c41cb9e8f13afb757bbb6e7a302b3aae21722e69dab91f6eff8099e5884d248299905b4c7687c02
This commit is contained in:
Wladimir J. van der Laan 2020-09-06 19:35:13 +02:00 committed by PastaPastaPasta
parent 2699f44673
commit ee3eae3c9f

View File

@ -16,7 +16,7 @@ from test_framework.util import (
# Windows disallow control characters (0-31) and /\?%:|"<>
FILE_CHAR_START = 32 if os.name == 'nt' else 1
FILE_CHAR_END = 128
FILE_CHAR_BLOCKLIST = '/\\?%*:|"<>' if os.name == 'nt' else '/'
FILE_CHARS_DISALLOWED = '/\\?%*:|"<>' if os.name == 'nt' else '/'
def notify_outputname(walletname, txid):
@ -29,7 +29,7 @@ class NotificationsTest(BitcoinTestFramework):
self.setup_clean_chain = True
def setup_network(self):
self.wallet = ''.join(chr(i) for i in range(FILE_CHAR_START, FILE_CHAR_END) if chr(i) not in FILE_CHAR_BLOCKLIST)
self.wallet = ''.join(chr(i) for i in range(FILE_CHAR_START, FILE_CHAR_END) if chr(i) not in FILE_CHARS_DISALLOWED)
self.alertnotify_dir = os.path.join(self.options.tmpdir, "alertnotify")
self.blocknotify_dir = os.path.join(self.options.tmpdir, "blocknotify")
self.walletnotify_dir = os.path.join(self.options.tmpdir, "walletnotify")