re-use AccountLayout

Author: rustopian

sdk/pinocchio/src/sysvars/slot_hashes/test_std.rs

@@ -25,31 +25,17 @@ fn test_from_account_info_constructor() {
     #[allow(unused_assignments)]
     let mut acct_ptr: *mut Account = core::ptr::null_mut();
 
-    #[repr(C)]
-    #[derive(Clone, Copy, Default)]
-    struct FakeAccount {
-        borrow_state: u8,
-        is_signer: u8,
-        is_writable: u8,
-        executable: u8,
-        resize_delta: i32,
-        key: Pubkey,
-        owner: Pubkey,
-        lamports: u64,
-        data_len: u64,
-    }
-
     unsafe {
-        let header_size = core::mem::size_of::<FakeAccount>();
+        let header_size = core::mem::size_of::<AccountLayout>();
         let total_size = header_size + data.len();
         let word_len = (total_size + 7) / 8;
         aligned_backing = std::vec![0u64; word_len];
         let base_ptr = aligned_backing.as_mut_ptr() as *mut u8;
 
-        let header_ptr = base_ptr as *mut FakeAccount;
+        let header_ptr = base_ptr as *mut AccountLayout;
         ptr::write(
             header_ptr,
-            FakeAccount {
+            AccountLayout {
                 borrow_state: crate::NON_DUP_MARKER,
                 is_signer: 0,
                 is_writable: 0,

sdk/pinocchio/src/sysvars/slot_hashes/test_utils.rs

@@ -14,16 +14,16 @@ use std::vec::Vec;
 /// use of them in tests.
 #[repr(C)]
 #[derive(Clone, Copy)]
-struct AccountLayout {
-    borrow_state: u8,
-    is_signer: u8,
-    is_writable: u8,
-    executable: u8,
-    resize_delta: i32,
-    key: Pubkey,
-    owner: Pubkey,
-    lamports: u64,
-    data_len: u64,
+pub struct AccountLayout {
+    pub borrow_state: u8,
+    pub is_signer: u8,
+    pub is_writable: u8,
+    pub executable: u8,
+    pub resize_delta: i32,
+    pub key: Pubkey,
+    pub owner: Pubkey,
+    pub lamports: u64,
+    pub data_len: u64,
 }
 
 /// Strategy that decides how much the slot number is decremented between