sysvar trait (#6667)

* sysvar trait

* get the new guy in on it

sdk/src/sysvar/clock.rs

@@ -4,65 +4,33 @@ pub use crate::clock::Clock;
 
 use crate::{
     account::Account,
-    account_info::AccountInfo,
     clock::{Epoch, Segment, Slot},
-    sysvar,
+    sysvar::Sysvar,
 };
-use bincode::serialized_size;
 
 const ID: [u8; 32] = [
     6, 167, 213, 23, 24, 199, 116, 201, 40, 86, 99, 152, 105, 29, 94, 182, 139, 94, 184, 163, 155,
     75, 109, 92, 115, 85, 91, 33, 0, 0, 0, 0,
 ];
 
-crate::solana_sysvar_id!(ID, "SysvarC1ock11111111111111111111111111111111");
+crate::solana_sysvar_id!(ID, "SysvarC1ock11111111111111111111111111111111", Clock);
 
-impl Clock {
-    pub fn size_of() -> usize {
-        serialized_size(&Self::default()).unwrap() as usize
-    }
-    pub fn from_account(account: &Account) -> Option<Self> {
-        account.deserialize_data().ok()
-    }
-    pub fn to_account(&self, account: &mut Account) -> Option<()> {
-        account.serialize_data(self).ok()
-    }
-    pub fn from_account_info(account: &AccountInfo) -> Option<Self> {
-        account.deserialize_data().ok()
-    }
-    pub fn to_account_info(&self, account: &mut AccountInfo) -> Option<()> {
-        account.serialize_data(self).ok()
-    }
-}
+impl Sysvar for Clock {}
 
-pub fn new_account(
+pub fn create_account(
     lamports: u64,
     slot: Slot,
     segment: Segment,
     epoch: Epoch,
     leader_schedule_epoch: Epoch,
 ) -> Account {
-    Account::new_data(
-        lamports,
-        &Clock {
-            slot,
-            segment,
-            epoch,
-            leader_schedule_epoch,
-        },
-        &sysvar::id(),
-    )
-    .unwrap()
-}
-
-use crate::account::KeyedAccount;
-use crate::instruction::InstructionError;
-
-pub fn from_keyed_account(account: &KeyedAccount) -> Result<Clock, InstructionError> {
-    if !check_id(account.unsigned_key()) {
-        return Err(InstructionError::InvalidArgument);
+    Clock {
+        slot,
+        segment,
+        epoch,
+        leader_schedule_epoch,
     }
-    Clock::from_account(account.account).ok_or(InstructionError::InvalidArgument)
+    .create_account(lamports)
 }
 
 #[cfg(test)]
@@ -71,7 +39,7 @@ mod tests {
 
     #[test]
     fn test_new() {
-        let account = new_account(1, 0, 0, 0, 0);
+        let account = create_account(1, 0, 0, 0, 0);
         let clock = Clock::from_account(&account).unwrap();
         assert_eq!(clock, Clock::default());
     }