Merge branch 'main' into traits2

Author: guibescos

program/rust/src/rust_oracle.rs

@@ -116,8 +116,7 @@ pub fn add_mapping(
     let hdr = load::<cmd_hdr_t>(instruction_data)?;
     let mut cur_mapping = load_checked::<pc_map_table_t>(cur_mapping, hdr.ver_)?;
     pyth_assert(
-        cur_mapping.num_ == PC_MAP_TABLE_SIZE
-            && unsafe { cur_mapping.next_.k8_.iter().all(|x| *x == 0) },
+        cur_mapping.num_ == PC_MAP_TABLE_SIZE && pubkey_is_zero(&cur_mapping.next_),
         ProgramError::InvalidArgument,
     )?;
 
@@ -198,7 +197,7 @@ pub fn add_publisher(
     }
 
     for i in 0..(price_data.num_ as usize) {
-        if pubkey_equal(&cmd_args.pub_, &price_data.comp_[i].pub_) {
+        if pubkey_equal(&cmd_args.pub_, bytes_of(&price_data.comp_[i].pub_)) {
             return Err(ProgramError::InvalidArgument);
         }
     }
@@ -354,13 +353,14 @@ pub fn pubkey_assign(target: &mut pc_pub_key_t, source: &[u8]) {
     unsafe { target.k1_.copy_from_slice(source) }
 }
 
-fn pubkey_is_zero(key: &pc_pub_key_t) -> bool {
+pub fn pubkey_is_zero(key: &pc_pub_key_t) -> bool {
     return unsafe { key.k8_.iter().all(|x| *x == 0) };
 }
 
-fn pubkey_equal(key1: &pc_pub_key_t, key2: &pc_pub_key_t) -> bool {
-    return unsafe { key1.k1_.iter().zip(&key2.k1_).all(|(x, y)| *x == *y) };
+pub fn pubkey_equal(target: &pc_pub_key_t, source: &[u8]) -> bool {
+    unsafe { target.k1_ == *source }
 }
+
 /// Convert `x: T` into a `U`, returning the appropriate `OracleError` if the conversion fails.
 fn try_convert<T, U: TryFrom<T>>(x: T) -> Result<U, OracleError> {
     // Note: the error here assumes we're only applying this function to integers right now.

program/rust/src/tests/test_add_mapping.rs

@@ -13,6 +13,8 @@ use crate::rust_oracle::{
     initialize_checked,
     load_checked,
     pubkey_assign,
+    pubkey_equal,
+    pubkey_is_zero,
 };
 use bytemuck::bytes_of;
 use solana_program::account_info::AccountInfo;
@@ -104,15 +106,11 @@ fn test_add_mapping() {
         let mut cur_mapping_data =
             load_checked::<pc_map_table_t>(&cur_mapping, PC_VERSION).unwrap();
 
-        assert!(unsafe {
-            cur_mapping_data
-                .next_
-                .k1_
-                .iter()
-                .zip(&next_mapping_key.to_bytes())
-                .all(|(x, y)| *x == *y)
-        });
-        assert!(unsafe { next_mapping_data.next_.k8_.iter().all(|x| *x == 0) });
+        assert!(pubkey_equal(
+            &cur_mapping_data.next_,
+            &next_mapping_key.to_bytes()
+        ));
+        assert!(pubkey_is_zero(&next_mapping_data.next_));
         pubkey_assign(&mut cur_mapping_data.next_, &Pubkey::default().to_bytes());
         cur_mapping_data.num_ = 0;
     }
@@ -135,7 +133,7 @@ fn test_add_mapping() {
     {
         let mut cur_mapping_data =
             load_checked::<pc_map_table_t>(&cur_mapping, PC_VERSION).unwrap();
-        assert!(unsafe { cur_mapping_data.next_.k8_.iter().all(|x| *x == 0) });
+        assert!(pubkey_is_zero(&cur_mapping_data.next_));
         cur_mapping_data.num_ = PC_MAP_TABLE_SIZE;
         cur_mapping_data.magic_ = 0;
     }

program/rust/src/tests/test_add_product.rs

@@ -16,7 +16,6 @@ use crate::c_oracle_header::{
     command_t_e_cmd_add_product,
     pc_map_table_t,
     pc_prod_t,
-    pc_pub_key_t,
     PC_ACCTYPE_MAPPING,
     PC_ACCTYPE_PRODUCT,
     PC_MAGIC,
@@ -30,6 +29,7 @@ use crate::rust_oracle::{
     clear_account,
     initialize_checked,
     load_checked,
+    pubkey_equal,
 };
 
 #[test]
@@ -210,8 +210,3 @@ fn test_add_product() {
     let mapping_data = load_checked::<pc_map_table_t>(&mapping_account, PC_VERSION).unwrap();
     assert_eq!(mapping_data.num_, PC_MAP_TABLE_SIZE);
 }
-
-// Assign pubkey bytes from source to target, fails if source is not 32 bytes
-fn pubkey_equal(target: &pc_pub_key_t, source: &[u8]) -> bool {
-    unsafe { target.k1_ == *source }
-}

program/rust/src/tests/test_utils.rs

@@ -0,0 +1,24 @@
+use solana_program::account_info::AccountInfo;
+use solana_program::system_program;
+use solana_program::native_token::LAMPORTS_PER_SOL;
+use solana_program::pubkey::Pubkey;
+use solana_program::clock::Epoch;
+
+fn setup_funding_account<'a>(& mut funding_balance : u64) -> AccountInfo<'a> {
+    let mut funding_balance = LAMPORTS_PER_SOL.clone();
+    static system_program : Pubkey = system_program::ID;
+    static funding_key : Pubkey = Pubkey::new_unique();
+
+    let funding_account = AccountInfo::new(
+        &funding_key,
+        true,
+        true,
+        funding_balance,
+        &mut [],
+        &system_program,
+        false,
+        Epoch::default(),
+    );
+
+    return funding_account
+}