gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rob Walker
2019-06-06 19:27:49 -07:00
committed by GitHub
parent 191483f4ee
commit fd9fd43e83
20 changed files with 199 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
programs/exchange_api/src/exchange_processor.rs
View File

@ -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,
);

31
programs/exchange_api/src/lib.rs
View File

@ -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()));
}
}