Cleanup

Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>

Author: anuraaga

src/connectrpc/_client_shared.py

@@ -22,9 +22,7 @@
 def prepare_get_params(
     codec: Codec, request_data: bytes, headers: HTTPHeaders
 ) -> dict[str, str]:
-    # Insertion order is the Query-Get order from the Connect spec; urlencode
-    # iterates dict items in insertion order, which has been guaranteed since
-    # Python 3.7 (we require >= 3.10).
+    # Follow order in spec: https://connectrpc.com/docs/protocol/#unary-get-request
     params: dict[str, str] = {"connect": f"v{CONNECT_PROTOCOL_VERSION}", "base64": "1"}
     if "content-encoding" in headers:
         params["compression"] = headers.pop("content-encoding")

test/test_client_shared.py

@@ -8,12 +8,7 @@
 from connectrpc.codec import proto_binary_codec
 
 
-def test_prepare_get_params_order_without_compression() -> None:
-    params = prepare_get_params(proto_binary_codec(), b"hello", HTTPHeaders([]))
-    assert list(params.keys()) == ["connect", "base64", "encoding", "message"]
-
-
-def test_prepare_get_params_order_with_compression() -> None:
+def test_prepare_get_params_order() -> None:
     headers = HTTPHeaders([("content-encoding", "gzip")])
     params = prepare_get_params(proto_binary_codec(), b"hello", headers)
     assert list(params.keys()) == [
@@ -24,11 +19,11 @@ def test_prepare_get_params_order_with_compression() -> None:
         "message",
     ]
     assert "content-encoding" not in headers
-
-
-def test_prepare_get_params_urlencode_order() -> None:
-    headers = HTTPHeaders([("content-encoding", "gzip")])
-    params = prepare_get_params(proto_binary_codec(), b"hello", headers)
     query = urlencode(params)
     expected_prefix = "connect=v1&base64=1&compression=gzip&encoding=proto&message="
     assert query.startswith(expected_prefix)
+
+
+def test_prepare_get_params_order_without_compression() -> None:
+    params = prepare_get_params(proto_binary_codec(), b"hello", HTTPHeaders([]))
+    assert list(params.keys()) == ["connect", "base64", "encoding", "message"]