v0.2.5-pre.009

crates/ksp-onchain-transport-lib/src/rpc_accounts.rs

@@ -1,5 +1,9 @@
 // file: crates/ksp-onchain-transport-lib/src/rpc_accounts.rs
-// version: 4
+// version: 5
+
+const MAX_MULTIPLE_ACCOUNTS: usize = 100;
+const MAX_PROGRAM_ACCOUNT_FILTERS: usize = 4;
+const MAX_MEMCMP_BYTES: usize = 128;
 
 /// Account-data encoding accepted by Solana HTTP account methods.
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
@@ -592,10 +596,6 @@ pub enum SolanaProgramAccountsResult {
     Context(crate::SolanaRpcResponse<std::vec::Vec<crate::SolanaKeyedAccount>>),
 }
 
-const MAX_MULTIPLE_ACCOUNTS: usize = 100;
-const MAX_PROGRAM_ACCOUNT_FILTERS: usize = 4;
-const MAX_MEMCMP_BYTES: usize = 128;
-
 impl crate::HttpTransportPool {
     /// Executes typed `getAccountInfo` through the common KSP HTTP transport path.
     pub async fn get_account_info(
@@ -752,6 +752,58 @@ impl crate::HttpTransportPool {
     }
 }
 
+#[derive(serde::Deserialize)]
+struct WireRpcResponse<T> {
+    context: serde_json::Value,
+    value: T,
+}
+
+#[derive(serde::Deserialize)]
+#[serde(untagged)]
+enum WireProgramAccountsResult {
+    Context(WireRpcResponse<std::vec::Vec<serde_json::Value>>),
+    Accounts(std::vec::Vec<serde_json::Value>),
+}
+
+#[derive(serde::Deserialize)]
+#[serde(untagged)]
+enum WireAccountData {
+    LegacyBinary(std::string::String),
+    JsonParsed(WireParsedAccountData),
+    Encoded((std::string::String, std::string::String)),
+}
+
+#[derive(serde::Deserialize)]
+struct WireParsedAccountData {
+    program: std::string::String,
+    parsed: serde_json::Value,
+    space: u64,
+}
+
+#[derive(serde::Deserialize)]
+struct WireAccount {
+    lamports: u64,
+    data: serde_json::Value,
+    owner: std::string::String,
+    executable: bool,
+    #[serde(rename = "rentEpoch")]
+    rent_epoch: u64,
+    #[serde(default)]
+    space: std::option::Option<u64>,
+}
+
+#[derive(serde::Deserialize)]
+struct WireKeyedAccount {
+    pubkey: std::string::String,
+    account: serde_json::Value,
+}
+
+#[derive(serde::Deserialize)]
+struct WireAccountBalance {
+    address: std::string::String,
+    lamports: u64,
+}
+
 fn account_descriptor(method: &str) -> ksp_core_lib::Result<&'static crate::HttpRpcMethodDescriptor> {
     let descriptor = crate::find_http_rpc_method(method);
     return match descriptor {
@@ -934,58 +986,6 @@ fn decode_keyed_accounts(method: &str, values: std::vec::Vec<serde_json::Value>)
     return std::result::Result::Ok(decoded_values);
 }
 
-#[derive(serde::Deserialize)]
-struct WireRpcResponse<T> {
-    context: serde_json::Value,
-    value: T,
-}
-
-#[derive(serde::Deserialize)]
-#[serde(untagged)]
-enum WireProgramAccountsResult {
-    Context(WireRpcResponse<std::vec::Vec<serde_json::Value>>),
-    Accounts(std::vec::Vec<serde_json::Value>),
-}
-
-#[derive(serde::Deserialize)]
-#[serde(untagged)]
-enum WireAccountData {
-    LegacyBinary(std::string::String),
-    JsonParsed(WireParsedAccountData),
-    Encoded((std::string::String, std::string::String)),
-}
-
-#[derive(serde::Deserialize)]
-struct WireParsedAccountData {
-    program: std::string::String,
-    parsed: serde_json::Value,
-    space: u64,
-}
-
-#[derive(serde::Deserialize)]
-struct WireAccount {
-    lamports: u64,
-    data: serde_json::Value,
-    owner: std::string::String,
-    executable: bool,
-    #[serde(rename = "rentEpoch")]
-    rent_epoch: u64,
-    #[serde(default)]
-    space: std::option::Option<u64>,
-}
-
-#[derive(serde::Deserialize)]
-struct WireKeyedAccount {
-    pubkey: std::string::String,
-    account: serde_json::Value,
-}
-
-#[derive(serde::Deserialize)]
-struct WireAccountBalance {
-    address: std::string::String,
-    lamports: u64,
-}
-
 #[cfg(test)]
 #[path = "../unit_tests/rpc_accounts.rs"]
 mod tests;