Another rename

Author: guibescos

program/rust/src/c_oracle_header.rs

@@ -57,46 +57,46 @@ impl PythAccount for PriceAccount {
 #[repr(C)]
 #[derive(Copy, Clone, Pod, Zeroable)]
 pub struct PriceAccount {
-    pub header:          AccountHeader,
+    pub header:             AccountHeader,
     /// Type of the price account
-    pub price_type:      u32,
+    pub price_type:         u32,
     /// Exponent for the published prices
-    pub exponent:        i32,
+    pub exponent:           i32,
     /// Current number of authorized publishers
-    pub num_:            u32,
+    pub num_:               u32,
     /// Number of valid quotes for the last aggregation
-    pub num_qt_:         u32,
+    pub num_qt_:            u32,
     /// Last slot with a succesful aggregation (status : TRADING)
-    pub last_slot_:      u64,
+    pub last_slot_:         u64,
     /// Second to last slot where aggregation was attempted
-    pub valid_slot_:     u64,
+    pub valid_slot_:        u64,
     /// Ema for price
-    pub twap_:           PriceEma,
+    pub twap_:              PriceEma,
     /// Ema for confidence
-    pub twac_:           PriceEma,
+    pub twac_:              PriceEma,
     /// Last time aggregation was attempted
-    pub timestamp_:      i64,
+    pub timestamp_:         i64,
     /// Minimum valid publisher quotes for a succesful aggregation
-    pub min_pub_:        u8,
-    pub unused_1_:       i8,
-    pub unused_2_:       i16,
-    pub unused_3_:       i32,
+    pub min_pub_:           u8,
+    pub unused_1_:          i8,
+    pub unused_2_:          i16,
+    pub unused_3_:          i32,
     /// Corresponding product account
-    pub prod_:           CPubkey,
+    pub product_account:    CPubkey,
     /// Next price account in the list
-    pub next_:           CPubkey,
+    pub next_price_account: CPubkey,
     /// Second to last slot where aggregation was succesful (i.e. status : TRADING)
-    pub prev_slot_:      u64,
+    pub prev_slot_:         u64,
     /// Aggregate price at prev_slot_
-    pub prev_price_:     i64,
+    pub prev_price_:        i64,
     /// Confidence interval at prev_slot_
-    pub prev_conf_:      u64,
+    pub prev_conf_:         u64,
     /// Timestamp of prev_slot_
-    pub prev_timestamp_: i64,
+    pub prev_timestamp_:    i64,
     /// Last attempted aggregate results
-    pub agg_:            PriceInfo,
+    pub agg_:               PriceInfo,
     /// Publishers' price components
-    pub comp_:           [PriceComponent; PC_COMP_SIZE as usize],
+    pub comp_:              [PriceComponent; PC_COMP_SIZE as usize],
 }
 
 #[repr(C)]

program/rust/src/rust_oracle.rs

@@ -369,9 +369,12 @@ pub fn add_price(
         initialize_pyth_account_checked::<PriceAccount>(price_account, cmd_args.header.version)?;
     price_data.exponent = cmd_args.exponent;
     price_data.price_type = cmd_args.price_type;
-    pubkey_assign(&mut price_data.prod_, &product_account.key.to_bytes());
     pubkey_assign(
-        &mut price_data.next_,
+        &mut price_data.product_account,
+        &product_account.key.to_bytes(),
+    );
+    pubkey_assign(
+        &mut price_data.next_price_account,
         bytes_of(&product_data.first_price_account),
     );
     pubkey_assign(
@@ -416,13 +419,13 @@ pub fn del_price(
         )?;
 
         pyth_assert(
-            pubkey_equal(&price_data.prod_, &product_account.key.to_bytes()),
+            pubkey_equal(&price_data.product_account, &product_account.key.to_bytes()),
             ProgramError::InvalidArgument,
         )?;
 
         pubkey_assign(
             &mut product_data.first_price_account,
-            bytes_of(&price_data.next_),
+            bytes_of(&price_data.next_price_account),
         );
     }
 

program/rust/src/tests/test_add_price.rs

@@ -83,10 +83,10 @@ fn test_add_price() {
         assert_eq!(price_data.exponent, 1);
         assert_eq!(price_data.price_type, 1);
         assert!(pubkey_equal(
-            &price_data.prod_,
+            &price_data.product_account,
             &product_account.key.to_bytes()
         ));
-        assert!(pubkey_is_zero(&price_data.next_));
+        assert!(pubkey_is_zero(&price_data.next_price_account));
         assert!(pubkey_equal(
             &product_data.first_price_account,
             &price_account.key.to_bytes()
@@ -110,11 +110,11 @@ fn test_add_price() {
         assert_eq!(price_data_2.exponent, 1);
         assert_eq!(price_data_2.price_type, 1);
         assert!(pubkey_equal(
-            &price_data_2.prod_,
+            &price_data_2.product_account,
             &product_account.key.to_bytes()
         ));
         assert!(pubkey_equal(
-            &price_data_2.next_,
+            &price_data_2.next_price_account,
             &price_account.key.to_bytes()
         ));
         assert!(pubkey_equal(

program/rust/src/tests/test_init_price.rs

@@ -67,8 +67,8 @@ fn test_init_price() {
         price_data.num_ = 4;
         pubkey_assign(&mut price_data.comp_[0].pub_, bytes_of(&publisher));
         pubkey_assign(&mut price_data.comp_[3].pub_, bytes_of(&publisher2));
-        pubkey_assign(&mut price_data.prod_, bytes_of(&product));
-        pubkey_assign(&mut price_data.next_, bytes_of(&next_price));
+        pubkey_assign(&mut price_data.product_account, bytes_of(&product));
+        pubkey_assign(&mut price_data.next_price_account, bytes_of(&next_price));
 
         price_data.last_slot_ = 100;
         price_data.valid_slot_ = 100;
@@ -115,8 +115,14 @@ fn test_init_price() {
             &price_data.comp_[3].pub_,
             bytes_of(&publisher2)
         ));
-        assert!(pubkey_equal(&price_data.prod_, bytes_of(&product)));
-        assert!(pubkey_equal(&price_data.next_, bytes_of(&next_price)));
+        assert!(pubkey_equal(
+            &price_data.product_account,
+            bytes_of(&product)
+        ));
+        assert!(pubkey_equal(
+            &price_data.next_price_account,
+            bytes_of(&next_price)
+        ));
 
         assert_eq!(price_data.last_slot_, 0);
         assert_eq!(price_data.valid_slot_, 0);