mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-05 02:33:07 +02:00
test: fix send_batch_request to pass callables when using --usecli
send_batch_request() was building raw dicts without a "jsonrpc" version, which made Core to treat them as version 1.0 requests.
This worked in normal mode, but failed with --usecli because TestNodeCLI.batch() expects callables, not dicts.
This commit fixes it by using get_request() which is defined in both AuthServiceProxy and TestNodeCLIAttr.
The assert is changed because by using get_reques() AuthServiceProxy treats it as "jsonrpc" version 2.0 requests, which don't return "error" keys.
Github-Pull: #34991
Rebased-From: 5603ae0ffa
This commit is contained in:
@@ -18,11 +18,11 @@ from typing import List, Any
|
|||||||
|
|
||||||
def send_batch_request(node: TestNode, method: str, params: List[Any]) -> List[Any]:
|
def send_batch_request(node: TestNode, method: str, params: List[Any]) -> List[Any]:
|
||||||
"""Send batch request and parse all results"""
|
"""Send batch request and parse all results"""
|
||||||
data = [{"method": method, "params": p} for p in params]
|
data = [getattr(node, method).get_request(*p) for p in params]
|
||||||
response = node.batch(data)
|
response = node.batch(data)
|
||||||
result = []
|
result = []
|
||||||
for item in response:
|
for item in response:
|
||||||
assert item["error"] is None, item["error"]
|
assert "error" not in item, item["error"]
|
||||||
result.append(item["result"])
|
result.append(item["result"])
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user