vote_account uses AccountSharedData to avoid copies (#23687)

* vote_account uses AccountSharedData to avoid copies

* simpler deserialize

core/src/progress_map.rs

@@ -702,13 +702,17 @@ impl ProgressMap {
 
 #[cfg(test)]
 mod test {
-    use {super::*, solana_runtime::vote_account::VoteAccount, solana_sdk::account::Account};
+    use {
+        super::*,
+        solana_runtime::vote_account::VoteAccount,
+        solana_sdk::account::{Account, AccountSharedData},
+    };
 
     fn new_test_vote_account() -> VoteAccount {
-        let account = Account {
+        let account = AccountSharedData::from(Account {
             owner: solana_vote_program::id(),
             ..Account::default()
-        };
+        });
         VoteAccount::try_from(account).unwrap()
     }
 

runtime/src/vote_account.rs

@@ -2,7 +2,7 @@ use {
     itertools::Itertools,
     serde::ser::{Serialize, Serializer},
     solana_sdk::{
-        account::{accounts_equal, Account, AccountSharedData, ReadableAccount},
+        account::{accounts_equal, AccountSharedData, ReadableAccount},
         instruction::InstructionError,
         pubkey::Pubkey,
     },
@@ -23,7 +23,7 @@ const INVALID_VOTE_STATE: Result<VoteState, Error> = Err(Error::InstructionError
 ));
 
 #[derive(Clone, Debug, PartialEq, AbiExample, Deserialize)]
-#[serde(try_from = "Account")]
+#[serde(try_from = "AccountSharedData")]
 pub struct VoteAccount(Arc<VoteAccountInner>);
 
 #[derive(Debug, Error)]
@@ -36,7 +36,7 @@ pub enum Error {
 
 #[derive(Debug, AbiExample)]
 struct VoteAccountInner {
-    account: Account,
+    account: AccountSharedData,
     vote_state: RwLock<Result<VoteState, Error>>,
     vote_state_once: Once,
 }
@@ -207,30 +207,23 @@ impl Serialize for VoteAccount {
     }
 }
 
+impl From<VoteAccount> for AccountSharedData {
+    fn from(account: VoteAccount) -> Self {
+        account.0.account.clone()
+    }
+}
+
 impl TryFrom<AccountSharedData> for VoteAccount {
     type Error = Error;
     fn try_from(account: AccountSharedData) -> Result<Self, Self::Error> {
-        Self::try_from(Account::from(account))
-    }
-}
-
-impl From<VoteAccount> for AccountSharedData {
-    fn from(account: VoteAccount) -> Self {
-        Self::from(account.0.account.clone())
-    }
-}
-
-impl TryFrom<Account> for VoteAccount {
-    type Error = Error;
-    fn try_from(account: Account) -> Result<Self, Self::Error> {
         let vote_account = VoteAccountInner::try_from(account)?;
         Ok(Self(Arc::new(vote_account)))
     }
 }
 
-impl TryFrom<Account> for VoteAccountInner {
+impl TryFrom<AccountSharedData> for VoteAccountInner {
     type Error = Error;
-    fn try_from(account: Account) -> Result<Self, Self::Error> {
+    fn try_from(account: AccountSharedData) -> Result<Self, Self::Error> {
         if !solana_vote_program::check_id(account.owner()) {
             return Err(Error::InvalidOwner(*account.owner()));
         }
@@ -355,7 +348,7 @@ mod tests {
     fn new_rand_vote_account<R: Rng>(
         rng: &mut R,
         node_pubkey: Option<Pubkey>,
-    ) -> (Account, VoteState) {
+    ) -> (AccountSharedData, VoteState) {
         let vote_init = VoteInit {
             node_pubkey: node_pubkey.unwrap_or_else(Pubkey::new_unique),
             authorized_voter: Pubkey::new_unique(),
@@ -370,7 +363,7 @@ mod tests {
             unix_timestamp: rng.gen(),
         };
         let vote_state = VoteState::new(&vote_init, &clock);
-        let account = Account::new_data(
+        let account = AccountSharedData::new_data(
             rng.gen(), // lamports
             &VoteStateVersions::new_current(vote_state.clone()),
             &solana_vote_program::id(), // owner

sdk/src/account.rs

@@ -4,7 +4,10 @@ use {
         lamports::LamportsError,
         pubkey::Pubkey,
     },
-    serde::ser::{Serialize, Serializer},
+    serde::{
+        ser::{Serialize, Serializer},
+        Deserialize,
+    },
     solana_program::{account_info::AccountInfo, debug_account_data::*, sysvar::Sysvar},
     std::{
         cell::{Ref, RefCell},
@@ -94,7 +97,8 @@ impl Serialize for AccountSharedData {
 /// An Account with data that is stored on chain
 /// This will be the in-memory representation of the 'Account' struct data.
 /// The existing 'Account' structure cannot easily change due to downstream projects.
-#[derive(PartialEq, Eq, Clone, Default, AbiExample)]
+#[derive(PartialEq, Eq, Clone, Default, AbiExample, Deserialize)]
+#[serde(from = "Account")]
 pub struct AccountSharedData {
     /// lamports in the account
     lamports: u64,