client-rust: use a normal vector for ConfigKeys

Author: buffalojoec

clients/rust/src/hooked/short_vec.rs

@@ -2,7 +2,7 @@
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use {
     borsh::{BorshDeserialize, BorshSerialize},
-    solana_program::pubkey::Pubkey,
+    solana_program::{pubkey::Pubkey, short_vec},
 };
 
 struct ShortU16(u16);
@@ -79,7 +79,7 @@ impl<T: Serialize> Serialize for ShortVec<T> {
     where
         S: Serializer,
     {
-        solana_program::short_vec::serialize(&self.0, serializer)
+        short_vec::serialize(&self.0, serializer)
     }
 }
 
@@ -89,16 +89,31 @@ impl<'de, T: Deserialize<'de>> Deserialize<'de> for ShortVec<T> {
     where
         D: Deserializer<'de>,
     {
-        solana_program::short_vec::deserialize(deserializer).map(ShortVec)
+        short_vec::deserialize(deserializer).map(ShortVec)
     }
 }
 
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[derive(BorshDeserialize, BorshSerialize, Clone, Debug, Eq, PartialEq)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ConfigKeys {
     /// Each key tuple comprises a unique `Pubkey` identifier,
     /// and `bool` whether that key is a signer of the data.
-    pub keys: ShortVec<(Pubkey, bool)>,
+    #[serde(with = "short_vec")]
+    pub keys: Vec<(Pubkey, bool)>,
+}
+
+impl BorshSerialize for ConfigKeys {
+    fn serialize<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
+        BorshSerialize::serialize(&self.keys, writer)
+    }
+}
+
+impl BorshDeserialize for ConfigKeys {
+    fn deserialize_reader<R: std::io::Read>(reader: &mut R) -> std::io::Result<Self> {
+        Ok(ConfigKeys {
+            keys: ShortVec::deserialize_reader(reader)?.0,
+        })
+    }
 }
 
 /// Utility for extracting the `ConfigKeys` data from the account data.
@@ -115,7 +130,7 @@ mod tests {
     use {super::*, assert_matches::assert_matches, bincode::serialize};
     use {
         bincode::deserialize,
-        solana_program::short_vec::{decode_shortu16_len, ShortU16},
+        short_vec::{decode_shortu16_len, ShortU16},
     };
 
     /// Return the serialized length.

clients/rust/src/instructions_bincode.rs

@@ -1,7 +1,7 @@
 //! Program instruction helpers.
 
 use {
-    crate::{ConfigKeys, ShortVec, ID},
+    crate::{ConfigKeys, ID},
     bincode::serialized_size,
     solana_program::{
         instruction::{AccountMeta, Instruction},
@@ -18,12 +18,7 @@ pub trait ConfigState: serde::Serialize + Default {
 
 fn initialize_account<T: ConfigState>(config_pubkey: &Pubkey) -> Instruction {
     let account_metas = vec![AccountMeta::new(*config_pubkey, true)];
-    let account_data = (
-        ConfigKeys {
-            keys: ShortVec(vec![]),
-        },
-        T::default(),
-    );
+    let account_data = (ConfigKeys { keys: vec![] }, T::default());
     Instruction::new_with_bincode(ID, &account_data, account_metas)
 }
 
@@ -34,12 +29,7 @@ pub fn create_account<T: ConfigState>(
     lamports: u64,
     keys: Vec<(Pubkey, bool)>,
 ) -> Vec<Instruction> {
-    let space = T::max_space().saturating_add(
-        serialized_size(&ConfigKeys {
-            keys: ShortVec(keys),
-        })
-        .unwrap(),
-    );
+    let space = T::max_space().saturating_add(serialized_size(&ConfigKeys { keys }).unwrap());
     vec![
         system_instruction::create_account(
             from_account_pubkey,
@@ -65,11 +55,6 @@ pub fn store<T: ConfigState>(
             account_metas.push(AccountMeta::new(*signer_pubkey, true));
         }
     }
-    let account_data = (
-        ConfigKeys {
-            keys: ShortVec(keys),
-        },
-        data,
-    );
+    let account_data = (ConfigKeys { keys }, data);
     Instruction::new_with_bincode(ID, &account_data, account_metas)
 }