Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ __pycache__/
/docs-build
/dist
/build
/src/descanso/_version.py

# well known common utilities
.idea/
Expand Down
3 changes: 2 additions & 1 deletion src/descanso/jsonrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,12 @@ def transform_request(
) -> HttpRequest:
request_id = get_extra(request, EXTRA_JSON_RPC_REQUEST_ID)
method = get_extra(request, EXTRA_JSON_RPC_METHOD)
params = {"params": request.body} if request.body is not None else {}
request.body = {
"jsonrpc": "2.0",
"id": request_id,
"method": method,
"params": request.body,
**params,
}
return request

Expand Down
49 changes: 49 additions & 0 deletions tests/request_transformers/test_jsonrpc.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
from descanso.jsonrpc import (
EXTRA_JSON_RPC_METHOD,
EXTRA_JSON_RPC_REQUEST_ID,
PackJsonRPC,
)
from descanso.request import HttpRequest


def test_empty_body_omit_params() -> None:
request = HttpRequest(
extras=[
(EXTRA_JSON_RPC_REQUEST_ID, "some_id"),
(EXTRA_JSON_RPC_METHOD, "some_method"),
],
method="POST",
)
expected_body = {
"id": "some_id",
"method": "some_method",
"jsonrpc": "2.0",
}

transformer = PackJsonRPC()
result_request = transformer.transform_request(request, [], [], {})

assert result_request.body == expected_body


def test_body_set_in_params() -> None:
params = {"param1": "value1", "param2": "value2"}
request = HttpRequest(
body=params,
extras=[
(EXTRA_JSON_RPC_REQUEST_ID, "some_id"),
(EXTRA_JSON_RPC_METHOD, "some_method"),
],
method="POST",
)
expected_body = {
"id": "some_id",
"method": "some_method",
"jsonrpc": "2.0",
"params": params,
}

transformer = PackJsonRPC()
result_request = transformer.transform_request(request, [], [], {})

assert result_request.body == expected_body
Loading