chore: rename variable for pyth store pid

Author: Riateche

runtime/src/bank/pyth/accumulator.rs

@@ -58,8 +58,8 @@ lazy_static! {
             .parse()
             .unwrap(),
     );
-    pub static ref BATCH_PUBLISH_PID: Pubkey = env_pubkey_or(
-        "BATCH_PUBLISH_PID",
+    pub static ref PRICE_STORE_PID: Pubkey = env_pubkey_or(
+        "PRICE_STORE_PID",
         "3m6sv6HGqEbuyLV84mD7rJn4MAC9LhUa1y1AUNVqcPfr"
             .parse()
             .unwrap(),

runtime/src/bank/pyth/batch_publish.rs

@@ -1,5 +1,5 @@
 use {
-    super::accumulator::BATCH_PUBLISH_PID,
+    super::accumulator::PRICE_STORE_PID,
     crate::{
         accounts_index::{IndexKey, ScanConfig, ScanError},
         bank::Bank,
@@ -33,14 +33,14 @@ pub fn extract_batch_publish_prices(
     bank: &Bank,
 ) -> Result<HashMap<u32, Vec<PublisherPriceValue>>, HandleBatchPublishError> {
     assert!(
-        bank.account_indexes_include_key(&*BATCH_PUBLISH_PID),
+        bank.account_indexes_include_key(&*PRICE_STORE_PID),
         "Oracle program account index missing"
     );
 
     let publish_program_accounts = bank
         .get_filtered_indexed_accounts(
-            &IndexKey::ProgramId(*BATCH_PUBLISH_PID),
-            |account| account.owner() == &*BATCH_PUBLISH_PID,
+            &IndexKey::ProgramId(*PRICE_STORE_PID),
+            |account| account.owner() == &*PRICE_STORE_PID,
             &ScanConfig::new(true),
             None,
         )

runtime/src/bank/pyth/mod.rs

@@ -1,7 +1,7 @@
 use {
     accumulator::{
-        ACCUMULATOR_EMITTER_ADDR, ACCUMULATOR_SEQUENCE_ADDR, BATCH_PUBLISH_PID, MESSAGE_BUFFER_PID,
-        ORACLE_PID, STAKE_CAPS_PARAMETERS_ADDR, WORMHOLE_PID,
+        ACCUMULATOR_EMITTER_ADDR, ACCUMULATOR_SEQUENCE_ADDR, MESSAGE_BUFFER_PID, ORACLE_PID,
+        PRICE_STORE_PID, STAKE_CAPS_PARAMETERS_ADDR, WORMHOLE_PID,
     },
     solana_sdk::pubkey::Pubkey,
 };
@@ -22,6 +22,6 @@ pub fn get_pyth_keys() -> Vec<(&'static str, Pubkey)> {
         ("WORMHOLE_PID", *WORMHOLE_PID),
         ("ORACLE_PID", *ORACLE_PID),
         ("STAKE_CAPS_PARAMETERS_ADDR", *STAKE_CAPS_PARAMETERS_ADDR),
-        ("BATCH_PUBLISH_PID", *BATCH_PUBLISH_PID),
+        ("PRICE_STORE_PID", *PRICE_STORE_PID),
     ]
 }

runtime/src/bank/pyth/tests/accumulator_tests.rs

@@ -3,8 +3,7 @@ use {
         bank::{
             pyth::{
                 accumulator::{
-                    ACCUMULATOR_RING_SIZE, BATCH_PUBLISH_PID, ORACLE_PID,
-                    STAKE_CAPS_PARAMETERS_ADDR,
+                    ACCUMULATOR_RING_SIZE, ORACLE_PID, PRICE_STORE_PID, STAKE_CAPS_PARAMETERS_ADDR,
                 },
                 get_pyth_keys,
                 tests::{create_new_bank_for_tests_with_index, new_from_parent},
@@ -1114,7 +1113,7 @@ fn test_get_accumulator_keys() {
         Pubkey::new_from_array(pythnet::WORMHOLE_PID),
         *ORACLE_PID,
         *STAKE_CAPS_PARAMETERS_ADDR,
-        *BATCH_PUBLISH_PID,
+        *PRICE_STORE_PID,
     ];
     assert_eq!(accumulator_keys, expected_pyth_keys);
 }

runtime/src/bank/pyth/tests/batch_publish_tests.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         bank::pyth::{
-            accumulator::{BATCH_PUBLISH_PID, ORACLE_PID},
+            accumulator::{ORACLE_PID, PRICE_STORE_PID},
             tests::{create_new_bank_for_tests_with_index, new_from_parent},
         },
         genesis_utils::{create_genesis_config_with_leader, GenesisConfigInfo},
@@ -50,13 +50,13 @@ fn test_batch_publish() {
                 PUBLISHER_CONFIG_SEED.as_bytes(),
                 &publisher_key.pubkey().to_bytes(),
             ],
-            &BATCH_PUBLISH_PID,
+            &PRICE_STORE_PID,
         );
         let publisher_buffer_key =
-            Pubkey::create_with_seed(&leader_pubkey, seed2, &BATCH_PUBLISH_PID).unwrap();
+            Pubkey::create_with_seed(&leader_pubkey, seed2, &PRICE_STORE_PID).unwrap();
 
         let mut publisher_config_account =
-            AccountSharedData::new(42, publisher_config::SIZE, &BATCH_PUBLISH_PID);
+            AccountSharedData::new(42, publisher_config::SIZE, &PRICE_STORE_PID);
 
         publisher_config::create(
             publisher_config_account.data_mut(),
@@ -67,7 +67,7 @@ fn test_batch_publish() {
         bank.store_account(&publisher_config_key, &publisher_config_account);
 
         let mut publisher_buffer_account =
-            AccountSharedData::new(42, buffer::size(100), &BATCH_PUBLISH_PID);
+            AccountSharedData::new(42, buffer::size(100), &PRICE_STORE_PID);
         {
             let (header, prices) = buffer::create(
                 publisher_buffer_account.data_mut(),

runtime/src/bank/pyth/tests/mod.rs

@@ -1,5 +1,5 @@
 use {
-    super::accumulator::{BATCH_PUBLISH_PID, MESSAGE_BUFFER_PID, ORACLE_PID},
+    super::accumulator::{MESSAGE_BUFFER_PID, ORACLE_PID, PRICE_STORE_PID},
     crate::{
         accounts_db::AccountShrinkThreshold,
         accounts_index::{
@@ -24,7 +24,7 @@ fn create_new_bank_for_tests_with_index(genesis_config: &GenesisConfig) -> Bank
         AccountSecondaryIndexes {
             keys: Some(AccountSecondaryIndexesIncludeExclude {
                 exclude: false,
-                keys: [*ORACLE_PID, *MESSAGE_BUFFER_PID, *BATCH_PUBLISH_PID]
+                keys: [*ORACLE_PID, *MESSAGE_BUFFER_PID, *PRICE_STORE_PID]
                     .into_iter()
                     .collect(),
             }),

validator/src/main.rs

@@ -52,7 +52,7 @@ use {
             AccountIndex, AccountSecondaryIndexes, AccountSecondaryIndexesIncludeExclude,
             AccountsIndexConfig, IndexLimitMb,
         },
-        bank::pyth::accumulator::{BATCH_PUBLISH_PID, MESSAGE_BUFFER_PID, ORACLE_PID},
+        bank::pyth::accumulator::{MESSAGE_BUFFER_PID, ORACLE_PID, PRICE_STORE_PID},
         hardened_unpack::MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
         runtime_config::RuntimeConfig,
         snapshot_config::SnapshotConfig,
@@ -3203,19 +3203,19 @@ fn process_account_indexes(matches: &ArgMatches) -> AccountSecondaryIndexes {
     if include_keys
         && (!account_indexes_include_keys.contains(&*ORACLE_PID)
             || !account_indexes_include_keys.contains(&*MESSAGE_BUFFER_PID)
-            || !account_indexes_include_keys.contains(&*BATCH_PUBLISH_PID))
+            || !account_indexes_include_keys.contains(&*PRICE_STORE_PID))
     {
         panic!(
                 "The oracle program id and message buffer program id must be included in the account index. Add the following flags\n\
                 --account-index-include-key {}\n\
                 --account-index-include-key {}\n\
                 --account-index-include-key {}\n",
-                &*ORACLE_PID, &*MESSAGE_BUFFER_PID, &*BATCH_PUBLISH_PID,
+                &*ORACLE_PID, &*MESSAGE_BUFFER_PID, &*PRICE_STORE_PID,
             );
     }
 
     if exclude_keys {
-        for key in &[&*ORACLE_PID, &*MESSAGE_BUFFER_PID, &*BATCH_PUBLISH_PID] {
+        for key in &[&*ORACLE_PID, &*MESSAGE_BUFFER_PID, &*PRICE_STORE_PID] {
             if account_indexes_exclude_keys.contains(key) {
                 panic!(
                     "This key must *not* be excluded from the account index: {}",