v0.2.2-pre.002-fix.001

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

@@ -1,5 +1,5 @@
 // file: crates/ksp-onchain-transport-lib/src/rpc_cluster.rs
-// version: 1
+// version: 2
 
 /// Contact information returned for one cluster node.
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -24,51 +24,82 @@ pub struct SolanaClusterNode {
 impl SolanaClusterNode {
     /// Returns the node identity public key.
     #[must_use]
-    pub const fn pubkey(&self) -> &ksp_core_lib::Pubkey { return &self.pubkey; }
+    pub const fn pubkey(&self) -> &ksp_core_lib::Pubkey {
+        return &self.pubkey;
+    }
     /// Returns the optional feature-set identifier.
     #[must_use]
-    pub const fn feature_set(&self) -> std::option::Option<u32> { return self.feature_set; }
+    pub const fn feature_set(&self) -> std::option::Option<u32> {
+        return self.feature_set;
+    }
     /// Returns the optional gossip endpoint.
     #[must_use]
-    pub fn gossip(&self) -> std::option::Option<&str> { return self.gossip.as_deref(); }
+    pub fn gossip(&self) -> std::option::Option<&str> {
+        return self.gossip.as_deref();
+    }
     /// Returns the optional PubSub endpoint.
     #[must_use]
-    pub fn pubsub(&self) -> std::option::Option<&str> { return self.pubsub.as_deref(); }
+    pub fn pubsub(&self) -> std::option::Option<&str> {
+        return self.pubsub.as_deref();
+    }
     /// Returns the optional JSON-RPC endpoint.
     #[must_use]
-    pub fn rpc(&self) -> std::option::Option<&str> { return self.rpc.as_deref(); }
+    pub fn rpc(&self) -> std::option::Option<&str> {
+        return self.rpc.as_deref();
+    }
     /// Returns the optional repair endpoint.
     #[must_use]
-    pub fn serve_repair(&self) -> std::option::Option<&str> { return self.serve_repair.as_deref(); }
+    pub fn serve_repair(&self) -> std::option::Option<&str> {
+        return self.serve_repair.as_deref();
+    }
     /// Returns the optional shred version.
     #[must_use]
-    pub const fn shred_version(&self) -> std::option::Option<u16> { return self.shred_version; }
+    pub const fn shred_version(&self) -> std::option::Option<u16> {
+        return self.shred_version;
+    }
     /// Returns the optional TPU endpoint.
     #[must_use]
-    pub fn tpu(&self) -> std::option::Option<&str> { return self.tpu.as_deref(); }
+    pub fn tpu(&self) -> std::option::Option<&str> {
+        return self.tpu.as_deref();
+    }
     /// Returns the optional TPU forwards endpoint.
     #[must_use]
-    pub fn tpu_forwards(&self) -> std::option::Option<&str> { return self.tpu_forwards.as_deref(); }
+    pub fn tpu_forwards(&self) -> std::option::Option<&str> {
+        return self.tpu_forwards.as_deref();
+    }
     /// Returns the optional TPU forwards QUIC endpoint.
     #[must_use]
-    pub fn tpu_forwards_quic(&self) -> std::option::Option<&str> { return self.tpu_forwards_quic.as_deref(); }
+    pub fn tpu_forwards_quic(&self) -> std::option::Option<&str> {
+        return self.tpu_forwards_quic.as_deref();
+    }
     /// Returns the optional TPU QUIC endpoint.
     #[must_use]
-    pub fn tpu_quic(&self) -> std::option::Option<&str> { return self.tpu_quic.as_deref(); }
+    pub fn tpu_quic(&self) -> std::option::Option<&str> {
+        return self.tpu_quic.as_deref();
+    }
     /// Returns the optional TPU vote endpoint.
     #[must_use]
-    pub fn tpu_vote(&self) -> std::option::Option<&str> { return self.tpu_vote.as_deref(); }
+    pub fn tpu_vote(&self) -> std::option::Option<&str> {
+        return self.tpu_vote.as_deref();
+    }
     /// Returns the optional TVU endpoint.
     #[must_use]
-    pub fn tvu(&self) -> std::option::Option<&str> { return self.tvu.as_deref(); }
+    pub fn tvu(&self) -> std::option::Option<&str> {
+        return self.tvu.as_deref();
+    }
     /// Returns the optional software-version string.
     #[must_use]
-    pub fn version(&self) -> std::option::Option<&str> { return self.version.as_deref(); }
+    pub fn version(&self) -> std::option::Option<&str> {
+        return self.version.as_deref();
+    }
     /// Returns the optional Agave client identifier extension.
     #[must_use]
-    pub fn client_id(&self) -> std::option::Option<&str> { return self.client_id.as_deref(); }
+    pub fn client_id(&self) -> std::option::Option<&str> {
+        return self.client_id.as_deref();
+    }
 
     /// Decodes one cluster-node contact record from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireClusterNode>(method, value);
         let wire = match decoded {
@@ -114,24 +145,37 @@ pub struct SolanaEpochInfo {
 impl SolanaEpochInfo {
     /// Returns the absolute slot.
     #[must_use]
-    pub const fn absolute_slot(&self) -> u64 { return self.absolute_slot; }
+    pub const fn absolute_slot(&self) -> u64 {
+        return self.absolute_slot;
+    }
     /// Returns the block height.
     #[must_use]
-    pub const fn block_height(&self) -> u64 { return self.block_height; }
+    pub const fn block_height(&self) -> u64 {
+        return self.block_height;
+    }
     /// Returns the epoch number.
     #[must_use]
-    pub const fn epoch(&self) -> u64 { return self.epoch; }
+    pub const fn epoch(&self) -> u64 {
+        return self.epoch;
+    }
     /// Returns the slot index within the epoch.
     #[must_use]
-    pub const fn slot_index(&self) -> u64 { return self.slot_index; }
+    pub const fn slot_index(&self) -> u64 {
+        return self.slot_index;
+    }
     /// Returns the number of slots in the epoch.
     #[must_use]
-    pub const fn slots_in_epoch(&self) -> u64 { return self.slots_in_epoch; }
+    pub const fn slots_in_epoch(&self) -> u64 {
+        return self.slots_in_epoch;
+    }
     /// Returns the nullable transaction count.
     #[must_use]
-    pub const fn transaction_count(&self) -> std::option::Option<u64> { return self.transaction_count; }
+    pub const fn transaction_count(&self) -> std::option::Option<u64> {
+        return self.transaction_count;
+    }
 
     /// Decodes epoch information from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireEpochInfo>(method, value);
         return match decoded {
@@ -161,21 +205,32 @@ pub struct SolanaEpochSchedule {
 impl SolanaEpochSchedule {
     /// Returns the first normal epoch.
     #[must_use]
-    pub const fn first_normal_epoch(&self) -> u64 { return self.first_normal_epoch; }
+    pub const fn first_normal_epoch(&self) -> u64 {
+        return self.first_normal_epoch;
+    }
     /// Returns the first normal slot.
     #[must_use]
-    pub const fn first_normal_slot(&self) -> u64 { return self.first_normal_slot; }
+    pub const fn first_normal_slot(&self) -> u64 {
+        return self.first_normal_slot;
+    }
     /// Returns the leader-schedule slot offset.
     #[must_use]
-    pub const fn leader_schedule_slot_offset(&self) -> u64 { return self.leader_schedule_slot_offset; }
+    pub const fn leader_schedule_slot_offset(&self) -> u64 {
+        return self.leader_schedule_slot_offset;
+    }
     /// Returns the number of slots per epoch.
     #[must_use]
-    pub const fn slots_per_epoch(&self) -> u64 { return self.slots_per_epoch; }
+    pub const fn slots_per_epoch(&self) -> u64 {
+        return self.slots_per_epoch;
+    }
     /// Returns whether epoch warmup is enabled.
     #[must_use]
-    pub const fn warmup(&self) -> bool { return self.warmup; }
+    pub const fn warmup(&self) -> bool {
+        return self.warmup;
+    }
 
     /// Decodes an epoch schedule from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireEpochSchedule>(method, value);
         return match decoded {
@@ -201,12 +256,17 @@ pub struct SolanaSnapshotSlotInfo {
 impl SolanaSnapshotSlotInfo {
     /// Returns the highest full snapshot slot.
     #[must_use]
-    pub const fn full(&self) -> u64 { return self.full; }
+    pub const fn full(&self) -> u64 {
+        return self.full;
+    }
     /// Returns the optional highest incremental snapshot slot.
     #[must_use]
-    pub const fn incremental(&self) -> std::option::Option<u64> { return self.incremental; }
+    pub const fn incremental(&self) -> std::option::Option<u64> {
+        return self.incremental;
+    }
 
     /// Decodes snapshot-slot information from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireSnapshotSlotInfo>(method, value);
         return match decoded {
@@ -231,11 +291,19 @@ impl SolanaLeaderScheduleConfig {
     }
     /// Returns the optional validator identity filter.
     #[must_use]
-    pub const fn identity(&self) -> std::option::Option<&ksp_core_lib::Pubkey> { return self.identity.as_ref(); }
+    pub const fn identity(&self) -> std::option::Option<&ksp_core_lib::Pubkey> {
+        return self.identity.as_ref();
+    }
     /// Returns the optional commitment level.
     #[must_use]
-    pub const fn commitment(&self) -> std::option::Option<crate::SolanaCommitment> { return self.commitment; }
-    fn is_empty(&self) -> bool { return self.identity.is_none() && self.commitment.is_none(); }
+    pub const fn commitment(&self) -> std::option::Option<crate::SolanaCommitment> {
+        return self.commitment;
+    }
+    #[cfg(test)]
+    fn is_empty(&self) -> bool {
+        return self.identity.is_none() && self.commitment.is_none();
+    }
+    #[cfg(test)]
     fn to_json_value(&self) -> serde_json::Value {
         let mut object = serde_json::Map::new();
         if let std::option::Option::Some(identity) = self.identity.as_ref() {
@@ -263,12 +331,15 @@ pub enum SolanaLeaderScheduleRequest {
 }
 
 impl Default for SolanaLeaderScheduleRequest {
-    fn default() -> Self { return Self::CurrentEpoch(std::option::Option::None); }
+    fn default() -> Self {
+        return Self::CurrentEpoch(std::option::Option::None);
+    }
 }
 
 impl SolanaLeaderScheduleRequest {
     /// Serializes the typed overload to the exact positional JSON-RPC params.
     #[must_use]
+    #[cfg(test)]
     pub(crate) fn to_json_params(&self) -> std::vec::Vec<serde_json::Value> {
         return match self {
             Self::CurrentEpoch(std::option::Option::None) => std::vec::Vec::new(),
@@ -290,9 +361,12 @@ pub struct SolanaLeaderSchedule {
 impl SolanaLeaderSchedule {
     /// Returns the complete leader schedule map.
     #[must_use]
-    pub const fn entries(&self) -> &std::collections::BTreeMap<ksp_core_lib::Pubkey, std::vec::Vec<usize>> { return &self.entries; }
+    pub const fn entries(&self) -> &std::collections::BTreeMap<ksp_core_lib::Pubkey, std::vec::Vec<usize>> {
+        return &self.entries;
+    }
 
     /// Decodes a leader schedule map from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<std::collections::BTreeMap<std::string::String, std::vec::Vec<usize>>>(method, value);
         let wire = match decoded {
@@ -334,18 +408,27 @@ impl SolanaVoteAccountsConfig {
     }
     /// Returns the optional commitment.
     #[must_use]
-    pub const fn commitment(&self) -> std::option::Option<crate::SolanaCommitment> { return self.commitment; }
+    pub const fn commitment(&self) -> std::option::Option<crate::SolanaCommitment> {
+        return self.commitment;
+    }
     /// Returns the optional vote-account public key filter.
     #[must_use]
-    pub const fn vote_pubkey(&self) -> std::option::Option<&ksp_core_lib::Pubkey> { return self.vote_pubkey.as_ref(); }
+    pub const fn vote_pubkey(&self) -> std::option::Option<&ksp_core_lib::Pubkey> {
+        return self.vote_pubkey.as_ref();
+    }
     /// Returns whether unstaked delinquent validators should be kept.
     #[must_use]
-    pub const fn keep_unstaked_delinquents(&self) -> std::option::Option<bool> { return self.keep_unstaked_delinquents; }
+    pub const fn keep_unstaked_delinquents(&self) -> std::option::Option<bool> {
+        return self.keep_unstaked_delinquents;
+    }
     /// Returns the optional delinquent slot distance.
     #[must_use]
-    pub const fn delinquent_slot_distance(&self) -> std::option::Option<u64> { return self.delinquent_slot_distance; }
+    pub const fn delinquent_slot_distance(&self) -> std::option::Option<u64> {
+        return self.delinquent_slot_distance;
+    }
     /// Serializes this config to the Solana JSON-RPC wire object.
     #[must_use]
+    #[cfg(test)]
     pub(crate) fn to_json_value(&self) -> serde_json::Value {
         let mut object = serde_json::Map::new();
         if let std::option::Option::Some(commitment) = self.commitment {
@@ -375,13 +458,19 @@ pub struct SolanaEpochCredits {
 impl SolanaEpochCredits {
     /// Returns the epoch number.
     #[must_use]
-    pub const fn epoch(&self) -> u64 { return self.epoch; }
+    pub const fn epoch(&self) -> u64 {
+        return self.epoch;
+    }
     /// Returns cumulative credits at the end of the epoch.
     #[must_use]
-    pub const fn credits(&self) -> u64 { return self.credits; }
+    pub const fn credits(&self) -> u64 {
+        return self.credits;
+    }
     /// Returns cumulative credits before the epoch.
     #[must_use]
-    pub const fn previous_credits(&self) -> u64 { return self.previous_credits; }
+    pub const fn previous_credits(&self) -> u64 {
+        return self.previous_credits;
+    }
 }
 
 /// One validator vote-account record returned by `getVoteAccounts`.
@@ -401,33 +490,52 @@ pub struct SolanaVoteAccountInfo {
 impl SolanaVoteAccountInfo {
     /// Returns the vote account public key.
     #[must_use]
-    pub const fn vote_pubkey(&self) -> &ksp_core_lib::Pubkey { return &self.vote_pubkey; }
+    pub const fn vote_pubkey(&self) -> &ksp_core_lib::Pubkey {
+        return &self.vote_pubkey;
+    }
     /// Returns the validator identity public key.
     #[must_use]
-    pub const fn node_pubkey(&self) -> &ksp_core_lib::Pubkey { return &self.node_pubkey; }
+    pub const fn node_pubkey(&self) -> &ksp_core_lib::Pubkey {
+        return &self.node_pubkey;
+    }
     /// Returns the activated stake in lamports.
     #[must_use]
-    pub const fn activated_stake(&self) -> u64 { return self.activated_stake; }
+    pub const fn activated_stake(&self) -> u64 {
+        return self.activated_stake;
+    }
     /// Returns the legacy/effective percentage commission field.
     #[must_use]
-    pub const fn commission(&self) -> u8 { return self.commission; }
+    pub const fn commission(&self) -> u8 {
+        return self.commission;
+    }
     /// Returns the optional raw inflation-rewards commission in basis points.
     #[must_use]
-    pub const fn inflation_rewards_commission_bps(&self) -> std::option::Option<u16> { return self.inflation_rewards_commission_bps; }
+    pub const fn inflation_rewards_commission_bps(&self) -> std::option::Option<u16> {
+        return self.inflation_rewards_commission_bps;
+    }
     /// Returns whether the vote account is staked for the current epoch.
     #[must_use]
-    pub const fn epoch_vote_account(&self) -> bool { return self.epoch_vote_account; }
+    pub const fn epoch_vote_account(&self) -> bool {
+        return self.epoch_vote_account;
+    }
     /// Returns the bounded RPC epoch-credit history.
     #[must_use]
-    pub fn epoch_credits(&self) -> &[crate::SolanaEpochCredits] { return self.epoch_credits.as_slice(); }
+    pub fn epoch_credits(&self) -> &[crate::SolanaEpochCredits] {
+        return self.epoch_credits.as_slice();
+    }
     /// Returns the latest voted slot or zero when no vote exists.
     #[must_use]
-    pub const fn last_vote(&self) -> u64 { return self.last_vote; }
+    pub const fn last_vote(&self) -> u64 {
+        return self.last_vote;
+    }
     /// Returns the current root slot or zero when no root exists.
     #[must_use]
-    pub const fn root_slot(&self) -> u64 { return self.root_slot; }
+    pub const fn root_slot(&self) -> u64 {
+        return self.root_slot;
+    }
 
     /// Decodes one vote-account record from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireVoteAccountInfo>(method, value);
         let wire = match decoded {
@@ -472,12 +580,17 @@ pub struct SolanaVoteAccountStatus {
 impl SolanaVoteAccountStatus {
     /// Returns current vote accounts.
     #[must_use]
-    pub fn current(&self) -> &[crate::SolanaVoteAccountInfo] { return self.current.as_slice(); }
+    pub fn current(&self) -> &[crate::SolanaVoteAccountInfo] {
+        return self.current.as_slice();
+    }
     /// Returns delinquent vote accounts.
     #[must_use]
-    pub fn delinquent(&self) -> &[crate::SolanaVoteAccountInfo] { return self.delinquent.as_slice(); }
+    pub fn delinquent(&self) -> &[crate::SolanaVoteAccountInfo] {
+        return self.delinquent.as_slice();
+    }
 
     /// Decodes the complete vote-account status response from the Solana JSON wire shape.
+    #[cfg(test)]
     pub(crate) fn decode_wire(method: &str, value: serde_json::Value) -> ksp_core_lib::Result<Self> {
         let decoded = crate::decode_wire_json::<WireVoteAccountStatus>(method, value);
         let wire = match decoded {
@@ -504,26 +617,42 @@ impl SolanaVoteAccountStatus {
     }
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct WireClusterNode {
     pubkey: std::string::String,
-    #[serde(default)] feature_set: std::option::Option<u32>,
-    #[serde(default)] gossip: std::option::Option<std::string::String>,
-    #[serde(default)] pubsub: std::option::Option<std::string::String>,
-    #[serde(default)] rpc: std::option::Option<std::string::String>,
-    #[serde(default)] serve_repair: std::option::Option<std::string::String>,
-    #[serde(default)] shred_version: std::option::Option<u16>,
-    #[serde(default)] tpu: std::option::Option<std::string::String>,
-    #[serde(default)] tpu_forwards: std::option::Option<std::string::String>,
-    #[serde(default)] tpu_forwards_quic: std::option::Option<std::string::String>,
-    #[serde(default)] tpu_quic: std::option::Option<std::string::String>,
-    #[serde(default)] tpu_vote: std::option::Option<std::string::String>,
-    #[serde(default)] tvu: std::option::Option<std::string::String>,
-    #[serde(default)] version: std::option::Option<std::string::String>,
-    #[serde(default)] client_id: std::option::Option<std::string::String>,
+    #[serde(default)]
+    feature_set: std::option::Option<u32>,
+    #[serde(default)]
+    gossip: std::option::Option<std::string::String>,
+    #[serde(default)]
+    pubsub: std::option::Option<std::string::String>,
+    #[serde(default)]
+    rpc: std::option::Option<std::string::String>,
+    #[serde(default)]
+    serve_repair: std::option::Option<std::string::String>,
+    #[serde(default)]
+    shred_version: std::option::Option<u16>,
+    #[serde(default)]
+    tpu: std::option::Option<std::string::String>,
+    #[serde(default)]
+    tpu_forwards: std::option::Option<std::string::String>,
+    #[serde(default)]
+    tpu_forwards_quic: std::option::Option<std::string::String>,
+    #[serde(default)]
+    tpu_quic: std::option::Option<std::string::String>,
+    #[serde(default)]
+    tpu_vote: std::option::Option<std::string::String>,
+    #[serde(default)]
+    tvu: std::option::Option<std::string::String>,
+    #[serde(default)]
+    version: std::option::Option<std::string::String>,
+    #[serde(default)]
+    client_id: std::option::Option<std::string::String>,
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct WireEpochInfo {
@@ -535,6 +664,7 @@ struct WireEpochInfo {
     transaction_count: std::option::Option<u64>,
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct WireEpochSchedule {
@@ -545,12 +675,14 @@ struct WireEpochSchedule {
     warmup: bool,
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 struct WireSnapshotSlotInfo {
     full: u64,
     incremental: std::option::Option<u64>,
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct WireVoteAccountInfo {
@@ -566,6 +698,7 @@ struct WireVoteAccountInfo {
     root_slot: u64,
 }
 
+#[cfg(test)]
 #[derive(serde::Deserialize)]
 struct WireVoteAccountStatus {
     current: std::vec::Vec<serde_json::Value>,