Skip to content

Commit 535b874

Browse files
committed
test: Combine rpcwhitelistdefault functions
Replace test_rpcwhitelistdefault_0_no_permissions and test_rpcwhitelistdefault_1_no_permissions with a single test_rpcwhitelistdefault_permissions function.
1 parent 2b6ce92 commit 535b874

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

test/functional/rpc_whitelist.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,16 @@ def run_test(self):
9191
assert_equal(200, rpccall(self.nodes[0], self.strange_users[4], "getblockcount").status)
9292

9393
self.test_users_permissions()
94-
self.test_rpcwhitelistdefault_0_no_permissions()
94+
self.test_rpcwhitelistdefault_permissions(0, 200)
9595

9696
# Replace file configurations
9797
self.nodes[0].replace_in_config([("rpcwhitelistdefault=0", "rpcwhitelistdefault=1")])
9898
with open(self.nodes[0].datadir_path / "bitcoin.conf", 'a', encoding='utf8') as f:
9999
f.write("rpcwhitelist=__cookie__:getblockcount,getblockchaininfo,getmempoolinfo,stop\n")
100100
self.restart_node(0)
101101

102-
# Test rpcwhitelistdefault=1
103102
self.test_users_permissions()
104-
self.test_rpcwhitelistdefault_1_no_permissions()
103+
self.test_rpcwhitelistdefault_permissions(1, 403)
105104

106105
def test_users_permissions(self):
107106
"""
@@ -118,27 +117,18 @@ def test_users_permissions(self):
118117
self.log.info(f"[{user[0]}]: Testing non-permitted permission: getblockchaininfo")
119118
assert_equal(403, rpccall(self.nodes[0], user, "getblockchaininfo").status)
120119

121-
def test_rpcwhitelistdefault_0_no_permissions(self):
120+
def test_rpcwhitelistdefault_permissions(self, default_value, expected_status):
122121
"""
123-
* rpcwhitelistdefault=0
122+
* rpcwhitelistdefault={default_value}
124123
* No Permissions defined
125-
Expected result: * strangedude6 (not whitelisted) can access any method
124+
Expected result: strangedude6 (not whitelisted) access is determined by default_value
125+
When default_value=0: expects 200
126+
When default_value=1: expects 403
126127
"""
127-
unrestricted_user = self.strange_users[6]
128+
user = self.strange_users[6] # strangedude6
128129
for permission in ["getbestblockhash", "getblockchaininfo"]:
129-
self.log.info(f"[{unrestricted_user[0]}]: Testing unrestricted user permission ({permission})")
130-
assert_equal(200, rpccall(self.nodes[0], unrestricted_user, permission).status)
131-
132-
def test_rpcwhitelistdefault_1_no_permissions(self):
133-
"""
134-
* rpcwhitelistdefault=1
135-
* No Permissions defined
136-
Expected result: * strangedude6 (not whitelisted) can not access any method
137-
"""
138-
139-
for permission in ["getbestblockhash", "getblockchaininfo"]:
140-
self.log.info(f"[{self.strange_users[6][0]}]: Testing rpcwhitelistdefault=1 no specified permission ({permission})")
141-
assert_equal(403, rpccall(self.nodes[0], self.strange_users[6], permission).status)
130+
self.log.info(f"[{user[0]}]: Testing rpcwhitelistdefault={default_value} no specified permission ({permission})")
131+
assert_equal(expected_status, rpccall(self.nodes[0], user, permission).status)
142132

143133

144134
if __name__ == "__main__":

0 commit comments

Comments
 (0)