Browse Source

Change crate type

febo 10 months ago
parent
commit
58001dbe82

+ 3 - 0
interface/Cargo.toml

@@ -7,6 +7,9 @@ license = { workspace = true }
 repository = { workspace = true }
 publish = false
 
+[lib]
+crate-type = ["rlib"]
+
 [dependencies]
 pinocchio = { workspace = true }
 pinocchio-pubkey = { workspace = true }

+ 1 - 1
interface/src/lib.rs

@@ -4,5 +4,5 @@ pub mod native_mint;
 pub mod state;
 
 pub mod program {
-    pinocchio_pubkey::declare_id!("11111111111111111111111111111111");
+    pinocchio_pubkey::declare_id!("PToken1111111111111111111111111111111111111");
 }

+ 3 - 4
p-token/tests/amount_to_ui_amount.rs

@@ -2,16 +2,15 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction};
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn amount_to_ui_amount(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/approve.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn approve(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/approve_checked.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn approve_checked(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/burn.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn burn(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/burn_checked.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn burn_checked(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/close_account.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     pubkey::Pubkey,
@@ -11,11 +11,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn close_account(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/freeze_account.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
 use spl_token::state::AccountState;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn freeze_account(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/initialize_account.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_account(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/initialize_account2.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_account2(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/initialize_account3.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_account3(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 5 - 3
p-token/tests/initialize_mint.rs

@@ -1,7 +1,10 @@
 #![cfg(feature = "test-sbf")]
 
+mod setup;
+
 use std::mem::size_of;
 
+use setup::TOKEN_PROGRAM_ID;
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_option::COption,
@@ -14,11 +17,10 @@ use solana_sdk::{
 use token_interface::state::mint::Mint;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_mint(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 5 - 3
p-token/tests/initialize_mint2.rs

@@ -1,7 +1,10 @@
 #![cfg(feature = "test-sbf")]
 
+mod setup;
+
 use std::mem::size_of;
 
+use setup::TOKEN_PROGRAM_ID;
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_option::COption,
@@ -14,11 +17,10 @@ use solana_sdk::{
 use token_interface::state::mint::Mint;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_mint2(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 5 - 3
p-token/tests/initialize_multisig.rs

@@ -1,5 +1,8 @@
 #![cfg(feature = "test-sbf")]
 
+mod setup;
+
+use setup::TOKEN_PROGRAM_ID;
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -11,11 +14,10 @@ use solana_sdk::{
 use spl_token::state::Multisig;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_multisig(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 5 - 3
p-token/tests/initialize_multisig2.rs

@@ -1,5 +1,8 @@
 #![cfg(feature = "test-sbf")]
 
+mod setup;
+
+use setup::TOKEN_PROGRAM_ID;
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -11,11 +14,10 @@ use solana_sdk::{
 use spl_token::state::Multisig;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn initialize_multisig2(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/mint_to.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn mint_to(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/mint_to_checked.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn mint_to_checked(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/revoke.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn revoke(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/set_authority.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_option::COption,
@@ -14,11 +14,10 @@ use solana_sdk::{
 use spl_token::instruction::AuthorityType;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn set_authority(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 4 - 0
p-token/tests/setup/mod.rs

@@ -1,4 +1,8 @@
+use solana_sdk::pubkey::Pubkey;
+
 #[allow(dead_code)]
 pub mod account;
 #[allow(dead_code)]
 pub mod mint;
+
+pub const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(token_interface::program::ID);

+ 3 - 4
p-token/tests/thaw_account.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -13,11 +13,10 @@ use solana_sdk::{
 use spl_token::state::AccountState;
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn thaw_account(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/transfer.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn transfer(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/transfer_checked.rs

@@ -2,7 +2,7 @@
 
 mod setup;
 
-use setup::{account, mint};
+use setup::{account, mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{
     program_pack::Pack,
@@ -12,11 +12,10 @@ use solana_sdk::{
 };
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn transfer_checked(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;
 

+ 3 - 4
p-token/tests/ui_amount_to_amount.rs

@@ -2,16 +2,15 @@
 
 mod setup;
 
-use setup::mint;
+use setup::{mint, TOKEN_PROGRAM_ID};
 use solana_program_test::{tokio, ProgramTest};
 use solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction};
 
 #[test_case::test_case(spl_token::ID ; "spl-token")]
-#[test_case::test_case(Pubkey::new_from_array(token_program::ID) ; "p-token")]
+#[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")]
 #[tokio::test]
 async fn ui_amount_to_amount(token_program: Pubkey) {
-    let program_id = Pubkey::new_from_array(token_program::ID);
-    let mut context = ProgramTest::new("token_program", program_id, None)
+    let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None)
         .start_with_context()
         .await;