add solana_name_id, reassociate names with modules, modularize id tests (#4580)

programs/budget_api/src/lib.rs

@@ -8,4 +8,7 @@ const BUDGET_PROGRAM_ID: [u8; 32] = [
     198, 115, 123, 98, 188, 19, 160, 0, 0, 0, 0,
 ];
 
-solana_sdk::solana_program_id!(BUDGET_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    BUDGET_PROGRAM_ID,
+    "Budget1111111111111111111111111111111111111"
+);

programs/config_api/src/lib.rs

@@ -8,7 +8,10 @@ const CONFIG_PROGRAM_ID: [u8; 32] = [
     64, 25, 163, 35, 239, 160, 0, 0, 0, 0,
 ];
 
-solana_sdk::solana_program_id!(CONFIG_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    CONFIG_PROGRAM_ID,
+    "Config1111111111111111111111111111111111111"
+);
 
 pub trait ConfigState: Serialize {
     /// Maximum space that the serialized representation will require

programs/exchange_api/src/exchange_processor.rs

@@ -2,7 +2,7 @@
 
 use crate::exchange_instruction::*;
 use crate::exchange_state::*;
-use crate::faucet_id;
+use crate::faucet;
 use log::*;
 use solana_metrics::inc_new_counter_info;
 use solana_sdk::account::KeyedAccount;
@@ -192,7 +192,7 @@ impl ExchangeProcessor {
         let mut to_account =
             Self::deserialize_account(&keyed_accounts[TO_ACCOUNT_INDEX].account.data)?;
 
-        if &faucet_id() == keyed_accounts[FROM_ACCOUNT_INDEX].unsigned_key() {
+        if &faucet::id() == keyed_accounts[FROM_ACCOUNT_INDEX].unsigned_key() {
             to_account.tokens[token] += tokens;
         } else {
             let state: ExchangeState =
@@ -590,7 +590,7 @@ mod test {
         let instruction = exchange_instruction::transfer_request(
             &owner.pubkey(),
             to,
-            &faucet_id(),
+            &faucet::id(),
             token,
             tokens,
         );
@@ -671,7 +671,7 @@ mod test {
         let instruction = exchange_instruction::transfer_request(
             &owner.pubkey(),
             &new,
-            &faucet_id(),
+            &faucet::id(),
             Token::A,
             42,
         );

programs/exchange_api/src/lib.rs

@@ -10,23 +10,20 @@ pub const EXCHANGE_PROGRAM_ID: [u8; 32] = [
     33, 70, 185, 192, 42, 31, 141, 152, 0, 0, 0, 0,
 ];
 
-solana_sdk::solana_program_id!(EXCHANGE_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    EXCHANGE_PROGRAM_ID,
+    "Exchange11111111111111111111111111111111111"
+);
 
-pub const EXCHANGE_FAUCET_ID: [u8; 32] = [
-    3, 147, 111, 103, 210, 47, 23, 11, 176, 29, 147, 89, 237, 155, 21, 62, 107, 105, 157, 1, 98,
-    204, 206, 211, 54, 212, 79, 15, 160, 0, 0, 0,
-];
+pub mod faucet {
+    pub const EXCHANGE_FAUCET_ID: [u8; 32] = [
+        3, 147, 111, 103, 210, 47, 23, 11, 176, 29, 147, 89, 237, 155, 21, 62, 107, 105, 157, 1,
+        98, 204, 206, 211, 54, 212, 79, 15, 160, 0, 0, 0,
+    ];
+
+    solana_sdk::solana_name_id!(
+        EXCHANGE_FAUCET_ID,
+        "ExchangeFaucet11111111111111111111111111111"
+    );
 
-pub fn faucet_id() -> solana_sdk::pubkey::Pubkey {
-    solana_sdk::pubkey::Pubkey::new(&EXCHANGE_FAUCET_ID)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn exchange_faucet_id() {
-        let ids = [("ExchangeFaucet11111111111111111111111111111", faucet_id())];
-        assert!(ids.iter().all(|(name, id)| *name == id.to_string()));
-    }
 }

programs/stake_api/src/lib.rs

@@ -6,4 +6,7 @@ const STAKE_PROGRAM_ID: [u8; 32] = [
     120, 114, 43, 104, 164, 157, 192, 0, 0, 0, 0,
 ];
 
-solana_sdk::solana_program_id!(STAKE_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    STAKE_PROGRAM_ID,
+    "Stake11111111111111111111111111111111111111"
+);

programs/storage_api/src/lib.rs

@@ -12,4 +12,7 @@ const STORAGE_PROGRAM_ID: [u8; 32] = [
     6, 162, 25, 123, 127, 68, 233, 59, 131, 151, 21, 152, 162, 120, 90, 37, 154, 88, 86, 5, 156,
     221, 182, 201, 142, 103, 151, 112, 0, 0, 0, 0,
 ];
-solana_sdk::solana_program_id!(STORAGE_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    STORAGE_PROGRAM_ID,
+    "Storage111111111111111111111111111111111111"
+);

programs/vote_api/src/lib.rs

@@ -6,4 +6,7 @@ const VOTE_PROGRAM_ID: [u8; 32] = [
     16, 67, 252, 13, 163, 83, 128, 0, 0, 0, 0,
 ];
 
-solana_sdk::solana_program_id!(VOTE_PROGRAM_ID);
+solana_sdk::solana_name_id!(
+    VOTE_PROGRAM_ID,
+    "Vote111111111111111111111111111111111111111"
+);