wip

Author: kariy

crates/rpc/rpc-types/src/outside_execution.rs

@@ -20,54 +20,6 @@ use katana_primitives::{ContractAddress, Felt};
 use serde::{Deserialize, Serialize};
 use starknet::macros::selector;
 
-mod calls_serde {
-    use katana_primitives::execution::Call;
-    use katana_primitives::{ContractAddress, Felt};
-    use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-    #[derive(Serialize)]
-    struct CallRef<'a> {
-        #[serde(rename = "to")]
-        contract_address: &'a ContractAddress,
-        #[serde(rename = "selector")]
-        entry_point_selector: &'a Felt,
-        calldata: &'a Vec<Felt>,
-    }
-
-    #[derive(Deserialize)]
-    struct CallDe {
-        #[serde(rename = "to")]
-        contract_address: ContractAddress,
-        #[serde(rename = "selector")]
-        entry_point_selector: Felt,
-        calldata: Vec<Felt>,
-    }
-
-    pub fn serialize<S: Serializer>(calls: &Vec<Call>, serializer: S) -> Result<S::Ok, S::Error> {
-        let refs: Vec<CallRef<'_>> = calls
-            .iter()
-            .map(|c| CallRef {
-                contract_address: &c.contract_address,
-                entry_point_selector: &c.entry_point_selector,
-                calldata: &c.calldata,
-            })
-            .collect();
-        refs.serialize(serializer)
-    }
-
-    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<Call>, D::Error> {
-        let items = Vec::<CallDe>::deserialize(deserializer)?;
-        Ok(items
-            .into_iter()
-            .map(|c| Call {
-                contract_address: c.contract_address,
-                entry_point_selector: c.entry_point_selector,
-                calldata: c.calldata,
-            })
-            .collect())
-    }
-}
-
 /// Nonce channel
 #[derive(Clone, CairoSerde, PartialEq, Debug, Serialize, Deserialize)]
 pub struct NonceChannel(
@@ -165,6 +117,54 @@ impl OutsideExecution {
     }
 }
 
+mod calls_serde {
+    use katana_primitives::execution::Call;
+    use katana_primitives::{ContractAddress, Felt};
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    #[derive(Serialize)]
+    struct CallRef<'a> {
+        #[serde(rename = "to")]
+        contract_address: &'a ContractAddress,
+        #[serde(rename = "selector")]
+        entry_point_selector: &'a Felt,
+        calldata: &'a Vec<Felt>,
+    }
+
+    #[derive(Deserialize)]
+    struct CallDe {
+        #[serde(rename = "to")]
+        contract_address: ContractAddress,
+        #[serde(rename = "selector")]
+        entry_point_selector: Felt,
+        calldata: Vec<Felt>,
+    }
+
+    pub fn serialize<S: Serializer>(calls: &Vec<Call>, serializer: S) -> Result<S::Ok, S::Error> {
+        let refs: Vec<CallRef<'_>> = calls
+            .iter()
+            .map(|c| CallRef {
+                contract_address: &c.contract_address,
+                entry_point_selector: &c.entry_point_selector,
+                calldata: &c.calldata,
+            })
+            .collect();
+        refs.serialize(serializer)
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<Call>, D::Error> {
+        let items = Vec::<CallDe>::deserialize(deserializer)?;
+        Ok(items
+            .into_iter()
+            .map(|c| Call {
+                contract_address: c.contract_address,
+                entry_point_selector: c.entry_point_selector,
+                calldata: c.calldata,
+            })
+            .collect())
+    }
+}
+
 #[cfg(test)]
 mod tests {