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

Commit 229d8f6

Browse files
committed
Change crate type
1 parent 7a1a089 commit 229d8f6

25 files changed

+82
-85
lines changed

interface/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ license = { workspace = true }
77
repository = { workspace = true }
88
publish = false
99

10+
[lib]
11+
crate-type = ["rlib"]
12+
1013
[dependencies]
1114
pinocchio = { workspace = true }
1215
pinocchio-pubkey = { workspace = true }

interface/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ pub mod native_mint;
44
pub mod state;
55

66
pub mod program {
7-
pinocchio_pubkey::declare_id!("11111111111111111111111111111111");
7+
pinocchio_pubkey::declare_id!("PToken1111111111111111111111111111111111111");
88
}

program/tests/amount_to_ui_amount.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
mod setup;
44

5-
use setup::mint;
5+
use setup::{mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction};
88

99
#[test_case::test_case(spl_token::ID ; "spl-token")]
10-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
10+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1111
#[tokio::test]
1212
async fn amount_to_ui_amount(token_program: Pubkey) {
13-
let program_id = Pubkey::new_from_array(token_program::ID);
14-
let mut context = ProgramTest::new("token_program", program_id, None)
13+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
1514
.start_with_context()
1615
.await;
1716

program/tests/approve.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
1212
};
1313

1414
#[test_case::test_case(spl_token::ID ; "spl-token")]
15-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
15+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1616
#[tokio::test]
1717
async fn approve(token_program: Pubkey) {
18-
let program_id = Pubkey::new_from_array(token_program::ID);
19-
let mut context = ProgramTest::new("token_program", program_id, None)
18+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2019
.start_with_context()
2120
.await;
2221

program/tests/approve_checked.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
1212
};
1313

1414
#[test_case::test_case(spl_token::ID ; "spl-token")]
15-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
15+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1616
#[tokio::test]
1717
async fn approve_checked(token_program: Pubkey) {
18-
let program_id = Pubkey::new_from_array(token_program::ID);
19-
let mut context = ProgramTest::new("token_program", program_id, None)
18+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2019
.start_with_context()
2120
.await;
2221

program/tests/burn.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
1212
};
1313

1414
#[test_case::test_case(spl_token::ID ; "spl-token")]
15-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
15+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1616
#[tokio::test]
1717
async fn burn(token_program: Pubkey) {
18-
let program_id = Pubkey::new_from_array(token_program::ID);
19-
let mut context = ProgramTest::new("token_program", program_id, None)
18+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2019
.start_with_context()
2120
.await;
2221

program/tests/burn_checked.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
1212
};
1313

1414
#[test_case::test_case(spl_token::ID ; "spl-token")]
15-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
15+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1616
#[tokio::test]
1717
async fn burn_checked(token_program: Pubkey) {
18-
let program_id = Pubkey::new_from_array(token_program::ID);
19-
let mut context = ProgramTest::new("token_program", program_id, None)
18+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2019
.start_with_context()
2120
.await;
2221

program/tests/close_account.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
pubkey::Pubkey,
@@ -11,11 +11,10 @@ use solana_sdk::{
1111
};
1212

1313
#[test_case::test_case(spl_token::ID ; "spl-token")]
14-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
14+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1515
#[tokio::test]
1616
async fn close_account(token_program: Pubkey) {
17-
let program_id = Pubkey::new_from_array(token_program::ID);
18-
let mut context = ProgramTest::new("token_program", program_id, None)
17+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
1918
.start_with_context()
2019
.await;
2120

program/tests/freeze_account.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::{account, mint};
5+
use setup::{account, mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
1313
use spl_token::state::AccountState;
1414

1515
#[test_case::test_case(spl_token::ID ; "spl-token")]
16-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
16+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1717
#[tokio::test]
1818
async fn freeze_account(token_program: Pubkey) {
19-
let program_id = Pubkey::new_from_array(token_program::ID);
20-
let mut context = ProgramTest::new("token_program", program_id, None)
19+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2120
.start_with_context()
2221
.await;
2322

program/tests/initialize_account.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mod setup;
44

5-
use setup::mint;
5+
use setup::{mint, TOKEN_PROGRAM_ID};
66
use solana_program_test::{tokio, ProgramTest};
77
use solana_sdk::{
88
program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
1313
};
1414

1515
#[test_case::test_case(spl_token::ID ; "spl-token")]
16-
#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
16+
#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
1717
#[tokio::test]
1818
async fn initialize_account(token_program: Pubkey) {
19-
let program_id = Pubkey::new_from_array(token_program::ID);
20-
let mut context = ProgramTest::new("token_program", program_id, None)
19+
let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
2120
.start_with_context()
2221
.await;
2322

0 commit comments

Comments
 (0)