Skip to content

Commit

Permalink
Merge bitcoin#19897: Change FILE_CHAR_BLOCKLIST to FILE_CHARS_DISALLOWED
Browse files Browse the repository at this point in the history
637d8bc 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 637d8bc
  laanwj:
    ACK 637d8bc — this is a clear variable name improvement
  theStack:
    ACK 637d8bc
  jonatack:
    ACK 637d8bc
  eriknylund:
    ACK 637d8bc
  promag:
    ACK 637d8bc.

Tree-SHA512: 028e7102eeaf61105736c55c119a7f5c05411f2b6715a7939c41cb9e8f13afb757bbb6e7a302b3aae21722e69dab91f6eff8099e5884d248299905b4c7687c02
  • Loading branch information
laanwj committed Sep 6, 2020
2 parents 68d1f16 + 637d8bc commit af8135e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/functional/feature_notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# 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):
Expand All @@ -31,7 +31,7 @@ def set_test_params(self):
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")
Expand Down

0 comments on commit af8135e

Please sign in to comment.