Skip to content

Commit 643b668

Browse files
committed
revert faction enlistment stuff
1 parent 5b3688e commit 643b668

File tree

1 file changed

+1
-49
lines changed
  • framework/example_programs/faction_enlistment/src

1 file changed

+1
-49
lines changed

framework/example_programs/faction_enlistment/src/lib.rs

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ use star_frame::prelude::*;
1919
)]
2020
pub struct FactionEnlistment;
2121

22-
#[derive(StarFrameProgram)]
23-
#[program(
24-
instruction_set = (),
25-
id = "FLisTRH6dJnCK8AzTfenGJgHBPMHoat9XRc65Qpk7Yua",
26-
no_setup, no_entrypoint
27-
)]
28-
pub struct Program1;
29-
30-
#[derive(StarFrameProgram)]
31-
#[program(
32-
instruction_set = (),
33-
id = "ALisTRH6dJnCK8AzTfenGJgHBPMHoat9XRc65Qpk7Yua",
34-
no_setup, no_entrypoint
35-
)]
36-
pub struct Program2;
37-
38-
#[derive(StarFrameProgram)]
39-
#[program(
40-
instruction_set = (),
41-
id = "BLisTRH6dJnCK8AzTfenGJgHBPMHoat9XRc65Qpk7Yua",
42-
no_setup, no_entrypoint
43-
)]
44-
pub struct Program3;
45-
4622
#[derive(InstructionSet)]
4723
pub enum FactionEnlistmentInstructionSet {
4824
ProcessEnlistPlayer(ProcessEnlistPlayerIx),
@@ -111,28 +87,7 @@ pub struct ProcessEnlistPlayer<'info> {
11187
/// Solana System program
11288
#[account_set(program)]
11389
pub system_program: Program<'info, SystemProgram>,
114-
// #[account_set(program)]
115-
// pub program1: Program<'info, Program1>,
116-
// #[account_set(program)]
117-
// pub program2: Program<'info, Program2>,
118-
// #[account_set(program)]
119-
// pub program3: Program<'info, Program3>,
12090
}
121-
//8432 -> none in cache, no access
122-
//8533 -> 1 in cache, no access
123-
//8845 -> 2 in cache, no access
124-
//9247 -> 3 in cache, no access
125-
126-
// with vecs:
127-
//8434 -> none in cache, no access
128-
//8722 -> 3 in cache, no access
129-
130-
// no cache, size 0 -> 8514
131-
// 4 in cache, size 0 -> 8891
132-
// 4 in cache, size 0, 4 accesses -> 9027
133-
134-
// no cache, size 4 -> 8552
135-
// 4 in cache, size 4 -> 8847
13691

13792
#[derive(
13893
ProgramAccount, Debug, Align1, Copy, Clone, CheckedBitPattern, NoUninit, Eq, PartialEq, Zeroable,
@@ -203,7 +158,7 @@ mod tests {
203158

204159
#[tokio::test]
205160
async fn banks_test() -> Result<()> {
206-
const SBF_FILE: bool = true;
161+
const SBF_FILE: bool = false;
207162
let program_test = if SBF_FILE {
208163
let target_dir = std::env::current_dir()?
209164
.join("../../../target/deploy")
@@ -262,9 +217,6 @@ mod tests {
262217
AccountMeta::new(faction_account, false),
263218
AccountMeta::new(player_account.pubkey(), true),
264219
AccountMeta::new_readonly(solana_sdk::system_program::id(), false),
265-
// AccountMeta::new_readonly(Program1::PROGRAM_ID, false),
266-
// AccountMeta::new_readonly(Program2::PROGRAM_ID, false),
267-
// AccountMeta::new_readonly(Program3::PROGRAM_ID, false),
268220
];
269221
let ix = solana_sdk::instruction::Instruction::new_with_bytes(
270222
FactionEnlistment::PROGRAM_ID,

0 commit comments

Comments
 (0)