v0.2.5-pre.009

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

@@ -1,5 +1,5 @@
 // file: crates/ksp-onchain-transport-lib/src/rpc_cluster.rs
-// version: 4
+// version: 5
 
 const MAX_GET_SLOT_LEADERS: u64 = 5_000;
 
@@ -807,55 +807,6 @@ impl crate::HttpTransportPool {
     }
 }
 
-fn push_context_config(params: &mut std::vec::Vec<serde_json::Value>, config: std::option::Option<&crate::SolanaContextConfig>) {
-    if let std::option::Option::Some(config) = config
-        && (config.commitment().is_some() || config.min_context_slot().is_some())
-    {
-        params.push((*config).to_json_value());
-    }
-    return;
-}
-
-fn decode_pubkey_list(method: &str, field: &'static str, value: serde_json::Value) -> ksp_core_lib::Result<std::vec::Vec<ksp_core_lib::Pubkey>> {
-    let decoded = crate::decode_wire_json::<std::vec::Vec<std::string::String>>(method, value);
-    let values = match decoded {
-        std::result::Result::Ok(values) => values,
-        std::result::Result::Err(error) => return std::result::Result::Err(error),
-    };
-    let mut pubkeys = std::vec::Vec::with_capacity(values.len());
-    for value in values {
-        let pubkey = crate::parse_wire_pubkey(method, field, value.as_str());
-        match pubkey {
-            std::result::Result::Ok(pubkey) => pubkeys.push(pubkey),
-            std::result::Result::Err(error) => return std::result::Result::Err(error),
-        }
-    }
-    return std::result::Result::Ok(pubkeys);
-}
-
-fn invalid_cluster_parameters<T>(method: &str, message: &str, field: &'static str, value: u64) -> ksp_core_lib::Result<T> {
-    return std::result::Result::Err(
-        ksp_core_lib::Error::new(crate::ERROR_CODE_INVALID_RPC_PARAMETERS, message)
-            .with_context("rpc_method", method)
-            .with_context(field, value.to_string()),
-    );
-}
-
-fn cluster_descriptor(method: &str) -> ksp_core_lib::Result<&'static crate::HttpRpcMethodDescriptor> {
-    let descriptor = crate::find_http_rpc_method(method);
-    return match descriptor {
-        std::option::Option::Some(descriptor)
-            if descriptor.category() == crate::HttpRpcCategory::Cluster && descriptor.coverage_release() == crate::HttpRpcCoverageRelease::V0_2_2 =>
-        {
-            std::result::Result::Ok(descriptor)
-        },
-        _ => std::result::Result::Err(
-            ksp_core_lib::Error::new(crate::ERROR_CODE_INVALID_RESPONSE, "typed Cluster descriptor is missing from the audited 0.2.2 registry")
-                .with_context("rpc_method", method),
-        ),
-    };
-}
-
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct WireClusterNode {
@@ -938,6 +889,55 @@ struct WireVoteAccountStatus {
     delinquent: std::vec::Vec<serde_json::Value>,
 }
 
+fn push_context_config(params: &mut std::vec::Vec<serde_json::Value>, config: std::option::Option<&crate::SolanaContextConfig>) {
+    if let std::option::Option::Some(config) = config
+        && (config.commitment().is_some() || config.min_context_slot().is_some())
+    {
+        params.push((*config).to_json_value());
+    }
+    return;
+}
+
+fn decode_pubkey_list(method: &str, field: &'static str, value: serde_json::Value) -> ksp_core_lib::Result<std::vec::Vec<ksp_core_lib::Pubkey>> {
+    let decoded = crate::decode_wire_json::<std::vec::Vec<std::string::String>>(method, value);
+    let values = match decoded {
+        std::result::Result::Ok(values) => values,
+        std::result::Result::Err(error) => return std::result::Result::Err(error),
+    };
+    let mut pubkeys = std::vec::Vec::with_capacity(values.len());
+    for value in values {
+        let pubkey = crate::parse_wire_pubkey(method, field, value.as_str());
+        match pubkey {
+            std::result::Result::Ok(pubkey) => pubkeys.push(pubkey),
+            std::result::Result::Err(error) => return std::result::Result::Err(error),
+        }
+    }
+    return std::result::Result::Ok(pubkeys);
+}
+
+fn invalid_cluster_parameters<T>(method: &str, message: &str, field: &'static str, value: u64) -> ksp_core_lib::Result<T> {
+    return std::result::Result::Err(
+        ksp_core_lib::Error::new(crate::ERROR_CODE_INVALID_RPC_PARAMETERS, message)
+            .with_context("rpc_method", method)
+            .with_context(field, value.to_string()),
+    );
+}
+
+fn cluster_descriptor(method: &str) -> ksp_core_lib::Result<&'static crate::HttpRpcMethodDescriptor> {
+    let descriptor = crate::find_http_rpc_method(method);
+    return match descriptor {
+        std::option::Option::Some(descriptor)
+            if descriptor.category() == crate::HttpRpcCategory::Cluster && descriptor.coverage_release() == crate::HttpRpcCoverageRelease::V0_2_2 =>
+        {
+            std::result::Result::Ok(descriptor)
+        },
+        _ => std::result::Result::Err(
+            ksp_core_lib::Error::new(crate::ERROR_CODE_INVALID_RESPONSE, "typed Cluster descriptor is missing from the audited 0.2.2 registry")
+                .with_context("rpc_method", method),
+        ),
+    };
+}
+
 #[cfg(test)]
 #[path = "../unit_tests/rpc_cluster.rs"]
 mod tests;