wip

Author: kariy

crates/rpc/rpc-server/tests/controller_deployment.rs

@@ -27,7 +27,7 @@ use katana_rpc_server::middleware::cartridge::ControllerDeploymentLayer;
 use katana_rpc_server::starknet::{PendingBlockProvider, StarknetApi, StarknetApiConfig};
 use katana_rpc_types::*;
 use katana_tasks::TaskManager;
-use serde_json::json;
+use serde_json::{json, Value};
 use starknet::signers::SigningKey;
 use tokio::net::TcpListener;
 use tower::Layer;
@@ -68,10 +68,7 @@ async fn estimate_fee_forwards_when_no_controllers() {
     let setup = setup_test(HashMap::new(), inner_responses).await;
 
     let tx = make_invoke_tx_json(DEPLOYER_ADDRESS);
-    let params = json!([[tx], [], "latest"]);
-    let raw = make_rpc_request_str("starknet_estimateFee", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("starknet_estimateFee", &json!([[tx], [], "latest"]));
     let response = setup.service.call(request).await;
 
     // The inner service should have been called exactly once.
@@ -102,9 +99,9 @@ async fn estimate_fee_prepends_deploy_tx_for_controller() {
         m
     };
 
+    // The inner service will receive 2 txs (1 deploy + 1 original) thus return 2 estimates.
     let inner_responses = {
         let mut m = HashMap::new();
-        // The inner service will receive 2 txs (1 deploy + 1 original).
         m.insert(
             "starknet_estimateFee".to_string(),
             json!([
@@ -133,11 +130,8 @@ async fn estimate_fee_prepends_deploy_tx_for_controller() {
 
     let setup = setup_test(cartridge_responses, inner_responses).await;
 
-    let tx = make_invoke_tx_json(CONTROLLER_ADDRESS);
-    let params = json!([[tx], [], "latest"]);
-    let raw = make_rpc_request_str("starknet_estimateFee", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let txs = [make_invoke_tx_json(CONTROLLER_ADDRESS)];
+    let request = make_rpc_request("starknet_estimateFee", &json!([txs, [], "latest"]));
     let response = setup.service.call(request).await;
 
     // Inner service should receive 2 txs: deploy tx + original tx.
@@ -192,11 +186,8 @@ async fn estimate_fee_forwards_for_non_controller() {
 
     let setup = setup_test(HashMap::new(), inner_responses).await;
 
-    let tx = make_invoke_tx_json(NON_CONTROLLER_ADDRESS);
-    let params = json!([[tx], [], "latest"]);
-    let raw = make_rpc_request_str("starknet_estimateFee", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let txs = [make_invoke_tx_json(NON_CONTROLLER_ADDRESS)];
+    let request = make_rpc_request("starknet_estimateFee", &json!([txs, [], "latest"]));
     let response = setup.service.call(request).await;
 
     // Inner service receives the request unchanged (1 tx).
@@ -245,13 +236,10 @@ async fn estimate_fee_deduplicates_same_controller() {
 
     let setup = setup_test(cartridge_responses, inner_responses).await;
 
-    let tx1 = make_invoke_tx_json(CONTROLLER_ADDRESS);
-    let tx2 = make_invoke_tx_json(CONTROLLER_ADDRESS);
-    let tx3 = make_invoke_tx_json(CONTROLLER_ADDRESS);
-    let params = json!([[tx1, tx2, tx3], [], "latest"]);
-    let raw = make_rpc_request_str("starknet_estimateFee", &params);
+    let tx = make_invoke_tx_json(CONTROLLER_ADDRESS);
+    let txs = [tx, tx.clone(), tx.clone()];
 
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("starknet_estimateFee", &json!([txs, [], "latest"]));
     let response = setup.service.call(request).await;
 
     // Inner service should receive 4 txs: 1 deploy + 3 original.
@@ -294,9 +282,7 @@ async fn execute_outside_skips_deploy_when_already_deployed() {
     let setup = setup_test(HashMap::new(), HashMap::new()).await;
 
     let params = make_execute_outside_params(DEPLOYER_ADDRESS);
-    let raw = make_rpc_request_str("cartridge_addExecuteFromOutside", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("cartridge_addExecuteFromOutside", &params);
     let _response = setup.service.call(request).await;
 
     // Pool should be empty — no deploy tx was added.
@@ -333,9 +319,7 @@ async fn execute_outside_deploys_controller() {
     let setup = setup_test(cartridge_responses, HashMap::new()).await;
 
     let params = make_execute_outside_params(CONTROLLER_ADDRESS);
-    let raw = make_rpc_request_str("cartridge_addExecuteFromOutside", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("cartridge_addExecuteFromOutside", &params);
     let _response = setup.service.call(request).await;
 
     // A deploy transaction should have been added to the pool.
@@ -361,9 +345,7 @@ async fn execute_outside_skips_deploy_for_non_controller() {
     let setup = setup_test(HashMap::new(), HashMap::new()).await;
 
     let params = make_execute_outside_params(NON_CONTROLLER_ADDRESS);
-    let raw = make_rpc_request_str("cartridge_addExecuteFromOutside", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("cartridge_addExecuteFromOutside", &params);
     let _response = setup.service.call(request).await;
 
     // Pool should be empty — no deploy tx was added.
@@ -395,9 +377,7 @@ async fn execute_outside_tx_method_variant() {
     let setup = setup_test(cartridge_responses, HashMap::new()).await;
 
     let params = make_execute_outside_params(CONTROLLER_ADDRESS);
-    let raw = make_rpc_request_str("cartridge_addExecuteOutsideTransaction", &params);
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("cartridge_addExecuteOutsideTransaction", &params);
     let _response = setup.service.call(request).await;
 
     // A deploy transaction should have been added to the pool.
@@ -425,9 +405,7 @@ async fn execute_outside_tx_method_variant() {
 async fn passthrough_other_methods() {
     let setup = setup_test(HashMap::new(), HashMap::new()).await;
 
-    let raw = make_rpc_request_str("starknet_getBlockNumber", &json!([]));
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("starknet_getBlockNumber", &json!([]));
     let _response = setup.service.call(request).await;
 
     let calls = setup.mock_rpc.recorded_calls();
@@ -451,9 +429,7 @@ async fn passthrough_malformed_estimate_fee() {
     let setup = setup_test(HashMap::new(), HashMap::new()).await;
 
     // Malformed params — not a valid array of transactions.
-    let raw = make_rpc_request_str("starknet_estimateFee", &json!(["not_valid"]));
-
-    let request: Request<'_> = serde_json::from_str(&raw).unwrap();
+    let request = make_rpc_request("starknet_estimateFee", &json!(["not_valid"]));
     let _response = setup.service.call(request).await;
 
     // The inner service should have received the request (fallthrough).
@@ -724,14 +700,14 @@ fn make_invoke_tx_json(sender_address: &str) -> serde_json::Value {
 }
 
 /// Creates a JSON-RPC 2.0 request string and constructs the corresponding `Request<'_>`.
-fn make_rpc_request_str(method: &str, params: &serde_json::Value) -> String {
-    json!({
+fn make_rpc_request<'a>(method: &str, params: &serde_json::Value) -> Request<'a> {
+    serde_json::from_value(json!({
         "jsonrpc": "2.0",
         "id": 1,
         "method": method,
         "params": params
-    })
-    .to_string()
+    }))
+    .unwrap()
 }
 
 /// A complete test setup context.