Remove to_account_shared_data from ReadableAccount

Author: LucasSte

account/src/lib.rs

@@ -226,6 +226,7 @@ pub trait ReadableAccount: Sized {
     fn owner(&self) -> &Pubkey;
     fn executable(&self) -> bool;
     fn rent_epoch(&self) -> Epoch;
+<<<<<<< HEAD
     #[deprecated(since = "3.2.0")]
     fn to_account_shared_data(&self) -> AccountSharedData {
         AccountSharedData::create(
@@ -236,6 +237,8 @@ pub trait ReadableAccount: Sized {
             self.rent_epoch(),
         )
     }
+=======
+>>>>>>> 8546c642 (Remove to_account_shared_data from ReadableAccount)
 }
 
 impl ReadableAccount for Account {
@@ -344,10 +347,6 @@ impl ReadableAccount for AccountSharedData {
     fn rent_epoch(&self) -> Epoch {
         self.rent_epoch
     }
-    fn to_account_shared_data(&self) -> AccountSharedData {
-        // avoid data copy here
-        self.clone()
-    }
 }
 
 impl ReadableAccount for Ref<'_, AccountSharedData> {
@@ -366,16 +365,6 @@ impl ReadableAccount for Ref<'_, AccountSharedData> {
     fn rent_epoch(&self) -> Epoch {
         self.rent_epoch
     }
-    fn to_account_shared_data(&self) -> AccountSharedData {
-        AccountSharedData {
-            lamports: self.lamports(),
-            // avoid data copy here
-            data: Arc::clone(&self.data),
-            owner: *self.owner(),
-            executable: self.executable(),
-            rent_epoch: self.rent_epoch(),
-        }
-    }
 }
 
 impl ReadableAccount for Ref<'_, Account> {
@@ -918,18 +907,6 @@ pub mod tests {
         account2.serialize_data(&"hello world").unwrap();
     }
 
-    #[test]
-    #[allow(deprecated)]
-    fn test_to_account_shared_data() {
-        let key = Pubkey::new_unique();
-        let (account1, account2) = make_two_accounts(&key);
-        assert!(accounts_equal(&account1, &account2));
-        let account3 = account1.to_account_shared_data();
-        let account4 = account2.to_account_shared_data();
-        assert!(accounts_equal(&account1, &account3));
-        assert!(accounts_equal(&account1, &account4));
-    }
-
     #[test]
     fn test_account_shared_data() {
         let key = Pubkey::new_unique();