Revert "check sysvar id for AccountInfo (#13175) (#13351)"

This reverts commit 290d514051.

sdk/program/src/sysvar/mod.rs

@@ -1,168 +0,0 @@
-//! named accounts for synthesized data accounts for bank state, etc.
-//!
-use crate::{
-    account::Account, account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey,
-};
-
-pub mod clock;
-pub mod epoch_schedule;
-pub mod fees;
-pub mod instructions;
-pub mod recent_blockhashes;
-pub mod rent;
-pub mod rewards;
-pub mod slot_hashes;
-pub mod slot_history;
-pub mod stake_history;
-
-pub fn is_sysvar_id(id: &Pubkey) -> bool {
-    clock::check_id(id)
-        || epoch_schedule::check_id(id)
-        || fees::check_id(id)
-        || recent_blockhashes::check_id(id)
-        || rent::check_id(id)
-        || rewards::check_id(id)
-        || slot_hashes::check_id(id)
-        || slot_history::check_id(id)
-        || stake_history::check_id(id)
-        || instructions::check_id(id)
-}
-
-#[macro_export]
-macro_rules! declare_sysvar_id(
-    ($name:expr, $type:ty) => (
-        $crate::declare_id!($name);
-
-        impl $crate::sysvar::SysvarId for $type {
-            fn check_id(pubkey: &$crate::pubkey::Pubkey) -> bool {
-                check_id(pubkey)
-            }
-        }
-
-        #[cfg(test)]
-        #[test]
-        fn test_sysvar_id() {
-            if !$crate::sysvar::is_sysvar_id(&id()) {
-                panic!("sysvar::is_sysvar_id() doesn't know about {}", $name);
-            }
-        }
-    )
-);
-
-// owner pubkey for sysvar accounts
-crate::declare_id!("Sysvar1111111111111111111111111111111111111");
-
-pub trait SysvarId {
-    fn check_id(pubkey: &Pubkey) -> bool;
-}
-
-// utilities for moving into and out of Accounts
-pub trait Sysvar:
-    SysvarId + Default + Sized + serde::Serialize + serde::de::DeserializeOwned
-{
-    fn size_of() -> usize {
-        bincode::serialized_size(&Self::default()).unwrap() as usize
-    }
-    fn from_account(account: &Account) -> Option<Self> {
-        bincode::deserialize(&account.data).ok()
-    }
-    fn to_account(&self, account: &mut Account) -> Option<()> {
-        bincode::serialize_into(&mut account.data[..], self).ok()
-    }
-    fn from_account_info(account_info: &AccountInfo) -> Result<Self, ProgramError> {
-        if !Self::check_id(account_info.unsigned_key()) {
-            return Err(ProgramError::InvalidArgument);
-        }
-        bincode::deserialize(&account_info.data.borrow()).map_err(|_| ProgramError::InvalidArgument)
-    }
-    fn to_account_info(&self, account_info: &mut AccountInfo) -> Option<()> {
-        bincode::serialize_into(&mut account_info.data.borrow_mut()[..], self).ok()
-    }
-    fn create_account(&self, lamports: u64) -> Account {
-        let data_len = Self::size_of().max(bincode::serialized_size(self).unwrap() as usize);
-        let mut account = Account::new(lamports, data_len, &id());
-        self.to_account(&mut account).unwrap();
-        account
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{clock::Epoch, program_error::ProgramError, pubkey::Pubkey};
-    use std::{cell::RefCell, rc::Rc};
-
-    #[repr(C)]
-    #[derive(Serialize, Deserialize, Debug, Default, PartialEq)]
-    pub struct TestSysvar {
-        something: Pubkey,
-    }
-    crate::declare_id!("TestSysvar111111111111111111111111111111111");
-    impl crate::sysvar::SysvarId for TestSysvar {
-        fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
-            check_id(pubkey)
-        }
-    }
-    impl Sysvar for TestSysvar {}
-
-    #[test]
-    fn test_sysvar_account_info_to_from() {
-        let test_sysvar = TestSysvar::default();
-        let key = crate::sysvar::tests::id();
-        let wrong_key = Pubkey::new_unique();
-        let owner = Pubkey::new_unique();
-        let mut lamports = 42;
-        let mut data = vec![0_u8; TestSysvar::size_of()];
-        let mut account_info = AccountInfo::new(
-            &key,
-            false,
-            true,
-            &mut lamports,
-            &mut data,
-            &owner,
-            false,
-            Epoch::default(),
-        );
-
-        test_sysvar.to_account_info(&mut account_info).unwrap();
-        let new_test_sysvar = TestSysvar::from_account_info(&account_info).unwrap();
-        assert_eq!(test_sysvar, new_test_sysvar);
-
-        account_info.key = &wrong_key;
-        assert_eq!(
-            TestSysvar::from_account_info(&account_info),
-            Err(ProgramError::InvalidArgument)
-        );
-
-        let mut small_data = vec![];
-        account_info.data = Rc::new(RefCell::new(&mut small_data));
-        assert_eq!(test_sysvar.to_account_info(&mut account_info), None);
-    }
-
-    #[test]
-    fn test_sysvar_keyed_account_to_from() {
-        let test_sysvar = TestSysvar::default();
-        let key = crate::sysvar::tests::id();
-        let wrong_key = Pubkey::new_unique();
-
-        let account = test_sysvar.create_account(42);
-        let test_sysvar = TestSysvar::from_account(&account).unwrap();
-        assert_eq!(test_sysvar, TestSysvar::default());
-
-        let mut account = Account::new(42, TestSysvar::size_of(), &key);
-        test_sysvar.to_account(&mut account).unwrap();
-        let test_sysvar = TestSysvar::from_account(&account).unwrap();
-        assert_eq!(test_sysvar, TestSysvar::default());
-
-        let account = RefCell::new(account);
-        let keyed_account = KeyedAccount::new(&key, false, &account);
-        let new_test_sysvar = TestSysvar::from_keyed_account(&keyed_account).unwrap();
-        assert_eq!(test_sysvar, new_test_sysvar);
-
-        let keyed_account = KeyedAccount::new(&wrong_key, false, &account);
-        assert_eq!(
-            TestSysvar::from_keyed_account(&keyed_account),
-            Err(InstructionError::InvalidArgument)
-        );
-    }
-}