Skip to content

Commit 2b6ce92

Browse files
committed
test: Update permissions and string formatting
Update get_permissions function to remove unnecessary replace() and improve password for strangedude6. Change all string concatenation to f-strings.
1 parent 698f869 commit 2b6ce92

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

test/functional/rpc_whitelist.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def rpccall(node, user, method):
2626

2727

2828
def get_permissions(whitelist):
29-
return [perm for perm in whitelist.replace(" ", "").split(",") if perm]
29+
return [perm for perm in whitelist.split(",") if perm]
3030

3131

3232
class RPCWhitelistTest(BitcoinTestFramework):
@@ -56,7 +56,7 @@ def run_test(self):
5656
# Testing the same permission twice
5757
["strangedude5", "d12c6e962d47a454f962eb41225e6ec8$2dd39635b155536d3c1a2e95d05feff87d5ba55f2d5ff975e6e997a836b717c9", ":getblockcount,getblockcount", "s7R4nG3R7H1nGZ"],
5858
# Test non-whitelisted user
59-
["strangedude6", "ab02e4fb22ef4ab004cca217a49ee8d2$90dd09b08edd12d552d9d8a5ada838dcef2ac587789fa7e9c47f5990e80cdf93", None, "password123"]
59+
["strangedude6", "67e5583538958883291f6917883eca64$8a866953ef9c5b7d078a62c64754a4eb74f47c2c17821eb4237021d7ef44f991", None, "N4SziYbHmhC1"]
6060
]
6161
# These commands shouldn't be allowed for any user to test failures
6262
self.never_allowed = ["getnetworkinfo"]
@@ -74,7 +74,7 @@ def run_test(self):
7474

7575
for user in self.users:
7676
for permission in self.never_allowed:
77-
self.log.info("[" + user[0] + "]: Testing a non permitted permission (" + permission + ")")
77+
self.log.info(f"[{user[0]}]: Testing a non permitted permission ({permission})")
7878
assert_equal(403, rpccall(self.nodes[0], user, permission).status)
7979
# Now test the strange users
8080
for permission in self.never_allowed:
@@ -113,9 +113,9 @@ def test_users_permissions(self):
113113
for user in self.users:
114114
permissions = get_permissions(user[2])
115115
for permission in permissions:
116-
self.log.info("[" + user[0] + "]: Testing whitelisted user permission (" + permission + ")")
116+
self.log.info(f"[{user[0]}]: Testing whitelisted user permission ({permission})")
117117
assert_equal(200, rpccall(self.nodes[0], user, permission).status)
118-
self.log.info("[" + user[0] + "]: Testing non-permitted permission: getblockchaininfo")
118+
self.log.info(f"[{user[0]}]: Testing non-permitted permission: getblockchaininfo")
119119
assert_equal(403, rpccall(self.nodes[0], user, "getblockchaininfo").status)
120120

121121
def test_rpcwhitelistdefault_0_no_permissions(self):
@@ -126,7 +126,7 @@ def test_rpcwhitelistdefault_0_no_permissions(self):
126126
"""
127127
unrestricted_user = self.strange_users[6]
128128
for permission in ["getbestblockhash", "getblockchaininfo"]:
129-
self.log.info("[" + unrestricted_user[0] + "]: Testing unrestricted user permission (" + permission + ")")
129+
self.log.info(f"[{unrestricted_user[0]}]: Testing unrestricted user permission ({permission})")
130130
assert_equal(200, rpccall(self.nodes[0], unrestricted_user, permission).status)
131131

132132
def test_rpcwhitelistdefault_1_no_permissions(self):
@@ -137,7 +137,7 @@ def test_rpcwhitelistdefault_1_no_permissions(self):
137137
"""
138138

139139
for permission in ["getbestblockhash", "getblockchaininfo"]:
140-
self.log.info("[" + self.strange_users[6][0] + "]: Testing rpcwhitelistdefault=1 no specified permission (" + permission + ")")
140+
self.log.info(f"[{self.strange_users[6][0]}]: Testing rpcwhitelistdefault=1 no specified permission ({permission})")
141141
assert_equal(403, rpccall(self.nodes[0], self.strange_users[6], permission).status)
142142

143143

0 commit comments

Comments
 (0)