From 072dab09483342e23c33c4a3d26900e32d72a3a4 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 08:33:13 +0000
Subject: [PATCH] Fix pr crossing for sysvar keyed-accounts (#13189) (#13191)

(cherry picked from commit 26eba5ac7d1d5af30d3102c30bd2f648c3806757)

Co-authored-by: Jack May <jack@solana.com>
---
 sdk/program/src/sysvar/mod.rs | 27 --------------------
 sdk/src/keyed_account.rs      | 47 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/sdk/program/src/sysvar/mod.rs b/sdk/program/src/sysvar/mod.rs
index f96c456d8c..a10d75cfb4 100644
--- a/sdk/program/src/sysvar/mod.rs
+++ b/sdk/program/src/sysvar/mod.rs
@@ -138,31 +138,4 @@ mod tests {
         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)
-        );
-    }
 }
diff --git a/sdk/src/keyed_account.rs b/sdk/src/keyed_account.rs
index 67f7141ef1..daa784841e 100644
--- a/sdk/src/keyed_account.rs
+++ b/sdk/src/keyed_account.rs
@@ -217,3 +217,50 @@ pub fn from_keyed_account<S: Sysvar>(
     }
     S::from_account(&*keyed_account.try_account_ref()?).ok_or(InstructionError::InvalidArgument)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::pubkey::Pubkey;
+    use std::cell::RefCell;
+
+    #[repr(C)]
+    #[derive(Serialize, Deserialize, Debug, Default, PartialEq)]
+    struct TestSysvar {
+        something: Pubkey,
+    }
+    crate::declare_id!("TestSysvar111111111111111111111111111111111");
+    impl solana_program::sysvar::SysvarId for TestSysvar {
+        fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
+            check_id(pubkey)
+        }
+    }
+    impl Sysvar for TestSysvar {}
+
+    #[test]
+    fn test_sysvar_keyed_account_to_from() {
+        let test_sysvar = TestSysvar::default();
+        let key = crate::keyed_account::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 = from_keyed_account::<TestSysvar>(&keyed_account).unwrap();
+        assert_eq!(test_sysvar, new_test_sysvar);
+
+        let keyed_account = KeyedAccount::new(&wrong_key, false, &account);
+        assert_eq!(
+            from_keyed_account::<TestSysvar>(&keyed_account),
+            Err(InstructionError::InvalidArgument)
+        );
+    }
+}