Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 0ec5757

Browse files
kevinheaveykevinheavey
committed
fmt and fix comment position after fmt
1 parent cb042a6 commit 0ec5757

File tree

16 files changed

+86
-64
lines changed
  • associated-token-account/program/src
  • binary-option/program/src
  • binary-oracle-pair/program/src
  • feature-proposal/program/src
  • instruction-padding/program/src
  • managed-token/program/src
  • memo/program/src
  • name-service/program/src
  • program-ids/src
  • record/program/src
  • shared-memory/program/src
  • single-pool/program/src
  • token-lending/program/src
  • token-swap/program/src
  • token-upgrade/program/src
  • token-wrap/program/src

16 files changed

+86
-64
lines changed

‎associated-token-account/program/src/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ pub mod instruction;
88
pub mod processor;
99
pub mod tools;
1010

11-
// Export current SDK types for downstream users building with a different SDK
12-
// version
13-
pub use solana_program;
1411
use solana_program::{
1512
instruction::{AccountMeta, Instruction},
1613
pubkey::Pubkey,
1714
sysvar,
1815
};
19-
20-
pub use spl_program_ids::spl_associated_token_account::*;
16+
// Export current SDK types for downstream users building with a different SDK
17+
// version
18+
pub use {solana_program, spl_program_ids::spl_associated_token_account::*};
2119

2220
pub(crate) fn get_associated_token_address_and_bump_seed(
2321
wallet_address: &Pubkey,

‎binary-option/program/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ pub mod system_utils;
99
pub mod validation_utils;
1010
// Export current sdk types for downstream users building with a different sdk
1111
// version
12-
pub use solana_program;
13-
14-
pub use spl_program_ids::spl_binary_option::*;
12+
pub use {solana_program, spl_program_ids::spl_binary_option::*};

‎binary-oracle-pair/program/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ mod entrypoint;
1212
// Export current sdk types for downstream users building with a different sdk
1313
// version
1414
pub use solana_program;
15-
1615
// Binary Oracle Pair id
1716
pub use spl_program_ids::spl_bianry_oracle_pair::*;

‎feature-proposal/program/src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ pub mod instruction;
77
pub mod processor;
88
pub mod state;
99

10+
use solana_program::{program_pack::Pack, pubkey::Pubkey};
1011
// Export current SDK types for downstream users building with a different SDK
1112
// version
12-
pub use solana_program;
13-
use solana_program::{program_pack::Pack, pubkey::Pubkey};
14-
15-
pub use spl_program_ids::spl_feature_proposal::*;
13+
pub use {solana_program, spl_program_ids::spl_feature_proposal::*};
1614

1715
pub(crate) fn get_mint_address_with_seed(feature_proposal_address: &Pubkey) -> (Pubkey, u8) {
1816
Pubkey::find_program_address(&[&feature_proposal_address.to_bytes(), br"mint"], &id())

‎instruction-padding/program/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ mod entrypoint;
22
pub mod instruction;
33
pub mod processor;
44

5-
pub use solana_program;
6-
pub use spl_program_ids::spl_instruction_padding::*;
5+
pub use {solana_program, spl_program_ids::spl_instruction_padding::*};

‎managed-token/program/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pub use spl_program_ids::spl_managed_token::*;
2-
32
use {
43
borsh::BorshDeserialize,
54
solana_program::{

‎memo/program/src/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
mod entrypoint;
88
pub mod processor;
99

10-
// Export current sdk types for downstream users building with a different sdk
11-
// version
12-
pub use solana_program;
1310
use solana_program::{
1411
instruction::{AccountMeta, Instruction},
1512
pubkey::Pubkey,
1613
};
17-
18-
pub use spl_program_ids::spl_memo::*;
14+
// Export current sdk types for downstream users building with a different sdk
15+
// version
16+
pub use {solana_program, spl_program_ids::spl_memo::*};
1917

2018
/// Build a memo instruction, possibly signed
2119
///

‎name-service/program/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ pub mod state;
77

88
// Export current sdk types for downstream users building with a different sdk
99
// version
10-
pub use solana_program;
11-
12-
pub use spl_program_ids::spl_name_service::*;
10+
pub use {solana_program, spl_program_ids::spl_name_service::*};

‎program-ids/src/lib.rs

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,72 @@ macro_rules! declare_id_mod {
55
pub mod $mod_name {
66
::solana_program::declare_id!($id_bs58);
77
}
8-
}
8+
};
99
}
1010

11-
declare_id_mod!(spl_account_compression, "cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
11+
declare_id_mod!(
12+
spl_account_compression,
13+
"cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK"
14+
);
1215
declare_id_mod!(spl_noop, "noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
13-
declare_id_mod!(spl_associated_token_account, "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
14-
declare_id_mod!(spl_binary_option, "betw959P4WToez4DkuXwNsJszqbpe3HuY56AcG5yevx");
15-
declare_id_mod!(spl_bianry_oracle_pair, "Fd7btgySsrjuo25CJCj7oE7VPMyezDhnx7pZkj2v69Nk");
16-
declare_id_mod!(spl_feature_proposal, "Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse");
17-
declare_id_mod!(spl_instruction_padding, "iXpADd6AW1k5FaaXum5qHbSqyd7TtoN6AD7suVa83MF");
16+
declare_id_mod!(
17+
spl_associated_token_account,
18+
"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
19+
);
20+
declare_id_mod!(
21+
spl_binary_option,
22+
"betw959P4WToez4DkuXwNsJszqbpe3HuY56AcG5yevx"
23+
);
24+
declare_id_mod!(
25+
spl_bianry_oracle_pair,
26+
"Fd7btgySsrjuo25CJCj7oE7VPMyezDhnx7pZkj2v69Nk"
27+
);
28+
declare_id_mod!(
29+
spl_feature_proposal,
30+
"Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse"
31+
);
32+
declare_id_mod!(
33+
spl_instruction_padding,
34+
"iXpADd6AW1k5FaaXum5qHbSqyd7TtoN6AD7suVa83MF"
35+
);
1836
declare_id_mod!(spl_math, "Math111111111111111111111111111111111111111");
19-
declare_id_mod!(spl_managed_token, "mTok58Lg4YfcmwqyrDHpf7ogp599WRhzb6PxjaBqAxS");
20-
declare_id_mod!(spl_name_service, "namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX");
37+
declare_id_mod!(
38+
spl_managed_token,
39+
"mTok58Lg4YfcmwqyrDHpf7ogp599WRhzb6PxjaBqAxS"
40+
);
41+
declare_id_mod!(
42+
spl_name_service,
43+
"namesLPneVptA9Z5rqUDD9tMTWEJwofgaYwp8cawRkX"
44+
);
2145
declare_id_mod!(spl_record, "recr1L3PCGKLbckBqMNcJhuuyU1zgo8nBhfLVsJNwr5");
22-
declare_id_mod!(spl_shared_memory, "shmem4EWT2sPdVGvTZCzXXRAURL9G5vpPxNwSeKhHUL");
23-
declare_id_mod!(spl_single_pool, "SVSPxpvHdN29nkVg9rPapPNDddN5DipNLRUFhyjFThE");
24-
declare_id_mod!(spl_stake_pool, "SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy");
25-
declare_id_mod!(spl_token_lending, "6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH");
26-
declare_id_mod!(spl_token_swap, "SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw");
27-
declare_id_mod!(spl_token_upgrade, "TkupDoNseygccBCjSsrSpMccjwHfTYwcrjpnDSrFDhC");
28-
declare_id_mod!(spl_token_wrap, "TwRapQCDhWkZRrDaHfZGuHxkZ91gHDRkyuzNqeU5MgR");
46+
declare_id_mod!(
47+
spl_shared_memory,
48+
"shmem4EWT2sPdVGvTZCzXXRAURL9G5vpPxNwSeKhHUL"
49+
);
50+
declare_id_mod!(
51+
spl_single_pool,
52+
"SVSPxpvHdN29nkVg9rPapPNDddN5DipNLRUFhyjFThE"
53+
);
54+
declare_id_mod!(
55+
spl_stake_pool,
56+
"SPoo1Ku8WFXoNDMHPsrGSTSG1Y47rzgn41SLUNakuHy"
57+
);
58+
declare_id_mod!(
59+
spl_token_lending,
60+
"6TvznH3B2e3p2mbhufNBpgSrLx6UkgvxtVQvopEZ2kuH"
61+
);
62+
declare_id_mod!(
63+
spl_token_swap,
64+
"SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw"
65+
);
66+
declare_id_mod!(
67+
spl_token_upgrade,
68+
"TkupDoNseygccBCjSsrSpMccjwHfTYwcrjpnDSrFDhC"
69+
);
70+
declare_id_mod!(
71+
spl_token_wrap,
72+
"TwRapQCDhWkZRrDaHfZGuHxkZ91gHDRkyuzNqeU5MgR"
73+
);
2974

3075
pub mod spl_memo {
3176
/// Legacy symbols from Memo v1
@@ -55,6 +100,9 @@ mod tests {
55100

56101
#[test]
57102
fn test_declare_id_mod() {
58-
assert_eq!(spl_account_compression::ID.to_string(), "cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
103+
assert_eq!(
104+
spl_account_compression::ID.to_string(),
105+
"cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK"
106+
);
59107
}
60108
}

‎record/program/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@ pub mod state;
99

1010
// Export current SDK types for downstream users building with a different SDK
1111
// version
12-
pub use solana_program;
13-
14-
pub use spl_program_ids::spl_record::*;
12+
pub use {solana_program, spl_program_ids::spl_record::*};

0 commit comments

Comments
 (0)