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

Add method id to SysbarId trait (#18604)

Browse Source
This commit is contained in:
Kirill Fomichev
2021-07-13 19:01:32 +03:00
committed by GitHub
parent 6829d210d4
commit 5cea25ac3e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/program/src/sysvar/mod.rs
View File

@ -32,6 +32,10 @@ macro_rules! declare_sysvar_id(
$crate::declare_id!($name); $crate::declare_id!($name);
impl $crate::sysvar::SysvarId for $type { impl $crate::sysvar::SysvarId for $type {
fn id() -> $crate::pubkey::Pubkey {
id()
}
fn check_id(pubkey: &$crate::pubkey::Pubkey) -> bool { fn check_id(pubkey: &$crate::pubkey::Pubkey) -> bool {
check_id(pubkey) check_id(pubkey)
} }
@ -51,6 +55,8 @@ macro_rules! declare_sysvar_id(
crate::declare_id!("Sysvar1111111111111111111111111111111111111"); crate::declare_id!("Sysvar1111111111111111111111111111111111111");
pub trait SysvarId { pub trait SysvarId {
fn id() -> Pubkey;
fn check_id(pubkey: &Pubkey) -> bool; fn check_id(pubkey: &Pubkey) -> bool;
} }
@ -113,6 +119,10 @@ mod tests {
} }
crate::declare_id!("TestSysvar111111111111111111111111111111111"); crate::declare_id!("TestSysvar111111111111111111111111111111111");
impl crate::sysvar::SysvarId for TestSysvar { impl crate::sysvar::SysvarId for TestSysvar {
fn id() -> crate::pubkey::Pubkey {
id()
}
fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool { fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
check_id(pubkey) check_id(pubkey)
} }

3
sdk/src/keyed_account.rs
View File

@ -270,6 +270,9 @@ mod tests {
} }
crate::declare_id!("TestSysvar111111111111111111111111111111111"); crate::declare_id!("TestSysvar111111111111111111111111111111111");
impl solana_program::sysvar::SysvarId for TestSysvar { impl solana_program::sysvar::SysvarId for TestSysvar {
fn id() -> crate::pubkey::Pubkey {
id()
}
fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool { fn check_id(pubkey: &crate::pubkey::Pubkey) -> bool {
check_id(pubkey) check_id(pubkey)
} }