From 901064ccd9096f36d87ae63e8f101747fac9d337 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Sun, 6 Sep 2020 19:35:13 +0200 Subject: [PATCH 1/2] Revert "Merge #19897: Change FILE_CHAR_BLOCKLIST to FILE_CHARS_DISALLOWED" This reverts commit af8135e369dae43d8ccaf2a76dfb461c05cc5ae7. --- test/functional/feature_notifications.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index 79e8df4b5e2245..c3a965159a05d0 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -17,7 +17,7 @@ # Windows disallow control characters (0-31) and /\?%:|"<> FILE_CHAR_START = 32 if platform.system() == 'Windows' else 1 FILE_CHAR_END = 128 -FILE_CHARS_DISALLOWED = '/\\?%*:|"<>' if platform.system() == 'Windows' else '/' +FILE_CHARS_BLOCKLIST = '/\\?%*:|"<>' if platform.system() == 'Windows' else '/' UNCONFIRMED_HASH_STRING = 'unconfirmed' def notify_outputname(walletname, txid): @@ -33,7 +33,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_CHARS_DISALLOWED) + self.wallet = ''.join(chr(i) for i in range(FILE_CHAR_START, FILE_CHAR_END) if chr(i) not in FILE_CHAR_BLOCKLIST) 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") From 711799326ab111970ffff7285e13661eb41f2b0e Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 9 Jun 2020 17:15:48 -0400 Subject: [PATCH 2/2] Revert "Merge #19227: test: change blacklist to blocklist" This reverts commit 221873e15874b5d5c02d674bcc982446adae6fa3. --- test/functional/feature_notifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index c3a965159a05d0..3fe120a7b251d2 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -33,7 +33,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_CHAR_BLACKLIST) 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")