diff options
| author | MarcoFalke <[email protected]> | 2020-06-09 17:15:48 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2020-06-09 17:15:52 -0400 |
| commit | 221873e15874b5d5c02d674bcc982446adae6fa3 (patch) | |
| tree | 5f4b40fbab5ad4ba01e9d0e572ad4f2ee9db83fa | |
| parent | Merge #19220: refactor: Replace RecursiveMutex with Mutex in warnings.cpp (diff) | |
| parent | change blacklist to blocklist (diff) | |
| download | discoin-221873e15874b5d5c02d674bcc982446adae6fa3.tar.xz discoin-221873e15874b5d5c02d674bcc982446adae6fa3.zip | |
Merge #19227: test: change blacklist to blocklist
6fc641644f7193365cf2b40f5cf20374ec871943 change blacklist to blocklist (TrentZ)
Pull request description:
Let's use a more appropriate and clear word and discard the usage of the blacklist. Blocklist is clear and shall make everyone happy.
ACKs for top commit:
amitiuttarwar:
ACK 6fc641644f7193365cf2b40f5cf20374ec871943
jonatack:
ACK 6fc641644f7193365cf2b40f5cf20374ec871943 git grep shows these two lines to be the only uses of the word in the codebase other than for specifying colors for the GUI.
sipsorcery:
ACK 6fc641644f7193365cf2b40f5cf20374ec871943 due to easy change.
Tree-SHA512: 12fd55ad5c79f1a227da90c7fa730972aae6b74ab1f9df79ec1e7d0eca05c383ef7d6ef5f353620a01da344db915005339b62ca0884179d0f47fbefb084c9efc
| -rwxr-xr-x | test/functional/feature_notifications.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/feature_notifications.py b/test/functional/feature_notifications.py index fb0c7ceed..33a308ad1 100755 --- a/test/functional/feature_notifications.py +++ b/test/functional/feature_notifications.py @@ -19,7 +19,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_BLACKLIST = '/\\?%*:|"<>' if os.name == 'nt' else '/' +FILE_CHAR_BLOCKLIST = '/\\?%*:|"<>' if os.name == 'nt' else '/' def notify_outputname(walletname, txid): @@ -32,7 +32,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_BLACKLIST) + 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") |