Upgrade precommit hooks (#253)

* Upgrade pre-commit hooks * Upgrade pre-commit hooks Closes #252

Author: bcb

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 fail_fast: true
 repos:
  - repo: https://github.com/ambv/black
- rev: 22.6.0
+ rev: 22.8.0
  hooks:
  - id: black
  args: [--diff, --check]
 
  - repo: https://github.com/pre-commit/mirrors-pylint
- rev: v3.0.0a4
+ rev: v3.0.0a5
  hooks:
  - id: pylint
  args: [--disable=all, --enable=unused-import]
 
  - repo: https://github.com/pre-commit/mirrors-mypy
- rev: v0.910
+ rev: v0.971
  hooks:
  - id: mypy
  exclude: (^tests|^examples|^docs)

tests/test_async_dispatcher.py

@@ -61,30 +61,24 @@ async def test_dispatch_request():
 
 @pytest.mark.asyncio
 async def test_dispatch_deserialized():
- assert (
- await dispatch_deserialized(
- {"ping": ping},
- NOCONTEXT,
- identity,
- {"jsonrpc": "2.0", "method": "ping", "id": 1},
- )
- == Right(SuccessResponse("pong", 1))
- )
+ assert await dispatch_deserialized(
+ {"ping": ping},
+ NOCONTEXT,
+ identity,
+ {"jsonrpc": "2.0", "method": "ping", "id": 1},
+ ) == Right(SuccessResponse("pong", 1))
 
 
 @pytest.mark.asyncio
 async def test_dispatch_to_response_pure_success():
- assert (
- await dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"ping": ping},
- request='{"jsonrpc": "2.0", "method": "ping", "id": 1}',
- )
- == Right(SuccessResponse("pong", 1))
- )
+ assert await dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"ping": ping},
+ request='{"jsonrpc": "2.0", "method": "ping", "id": 1}',
+ ) == Right(SuccessResponse("pong", 1))
 
 
 @patch("jsonrpcserver.async_dispatcher.dispatch_request", side_effect=ValueError("foo"))
@@ -93,14 +87,11 @@ async def test_dispatch_to_response_pure_server_error(*_):
  async def foo():
  return Success()
 
- assert (
- await dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"foo": foo},
- request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
- )
- == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))
- )
+ assert await dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"foo": foo},
+ request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
+ ) == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))

tests/test_dispatcher.py

@@ -281,15 +281,12 @@ def test_not_notification_false():
 
 
 def test_dispatch_deserialized():
- assert (
- dispatch_deserialized(
- methods={"ping": ping},
- context=NOCONTEXT,
- post_process=identity,
- deserialized={"jsonrpc": "2.0", "method": "ping", "id": 1},
- )
- == Right(SuccessResponse("pong", 1))
- )
+ assert dispatch_deserialized(
+ methods={"ping": ping},
+ context=NOCONTEXT,
+ post_process=identity,
+ deserialized={"jsonrpc": "2.0", "method": "ping", "id": 1},
+ ) == Right(SuccessResponse("pong", 1))
 
 
 # validate_request
@@ -326,17 +323,14 @@ def test_dispatch_request():
 
 
 def test_dispatch_to_response_pure():
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"ping": ping},
- request='{"jsonrpc": "2.0", "method": "ping", "id": 1}',
- )
- == Right(SuccessResponse("pong", 1))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"ping": ping},
+ request='{"jsonrpc": "2.0", "method": "ping", "id": 1}',
+ ) == Right(SuccessResponse("pong", 1))
 
 
 def test_dispatch_to_response_pure_parse_error():
@@ -418,52 +412,43 @@ def foo(colour: str) -> Result:
  if colour not in ("orange", "red", "yellow"):
  return InvalidParams()
 
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"foo": foo},
- request='{"jsonrpc": "2.0", "method": "foo", "params": ["blue"], "id": 1}',
- )
- == Left(ErrorResponse(ERROR_INVALID_PARAMS, "Invalid params", NODATA, 1))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"foo": foo},
+ request='{"jsonrpc": "2.0", "method": "foo", "params": ["blue"], "id": 1}',
+ ) == Left(ErrorResponse(ERROR_INVALID_PARAMS, "Invalid params", NODATA, 1))
 
 
 def test_dispatch_to_response_pure_internal_error():
  def foo():
  raise ValueError("foo")
 
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"foo": foo},
- request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
- )
- == Left(ErrorResponse(ERROR_INTERNAL_ERROR, "Internal error", "foo", 1))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"foo": foo},
+ request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
+ ) == Left(ErrorResponse(ERROR_INTERNAL_ERROR, "Internal error", "foo", 1))
 
 
 @patch("jsonrpcserver.dispatcher.dispatch_request", side_effect=ValueError("foo"))
 def test_dispatch_to_response_pure_server_error(*_):
  def foo():
  return Success()
 
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"foo": foo},
- request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
- )
- == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"foo": foo},
+ request='{"jsonrpc": "2.0", "method": "foo", "id": 1}',
+ ) == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))
 
 
 def test_dispatch_to_response_pure_invalid_result():
@@ -495,17 +480,14 @@ def test_dispatch_to_response_pure_raising_exception():
  def raise_exception():
  raise JsonRpcError(code=0, message="foo", data="bar")
 
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"raise_exception": raise_exception},
- request='{"jsonrpc": "2.0", "method": "raise_exception", "id": 1}',
- )
- == Left(ErrorResponse(0, "foo", "bar", 1))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"raise_exception": raise_exception},
+ request='{"jsonrpc": "2.0", "method": "raise_exception", "id": 1}',
+ ) == Left(ErrorResponse(0, "foo", "bar", 1))
 
 
 # dispatch_to_response_pure -- Notifications
@@ -634,17 +616,14 @@ def test_dispatch_to_response_pure_notification_server_error(*_):
  def foo():
  return Success()
 
- assert (
- dispatch_to_response_pure(
- deserializer=default_deserializer,
- validator=default_validator,
- post_process=identity,
- context=NOCONTEXT,
- methods={"foo": foo},
- request='{"jsonrpc": "2.0", "method": "foo"}',
- )
- == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))
- )
+ assert dispatch_to_response_pure(
+ deserializer=default_deserializer,
+ validator=default_validator,
+ post_process=identity,
+ context=NOCONTEXT,
+ methods={"foo": foo},
+ request='{"jsonrpc": "2.0", "method": "foo"}',
+ ) == Left(ErrorResponse(ERROR_SERVER_ERROR, "Server error", "foo", None))
 
 
 def test_dispatch_to_response_pure_notification_invalid_result():