Skip to content

Commit

Permalink
use small crates in cargo-build-sbf tests to get around patching issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinheavey
kevinheavey committed Jan 30, 2025
1 parent b9ead64 commit 0502247
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 31 deletions.
10 changes: 4 additions & 6 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/fail/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ edition = "2021"
publish = false

[dependencies]
solana-program = { path = "../../../../../sdk/program", version = "=2.2.0" }
solana-account-info= { path = "../../../../../sdk/account-info", version = "=2.2.0" }
solana-program-entrypoint = { path = "../../../../../sdk/program-entrypoint", version = "=2.2.0" }
solana-program-error= { path = "../../../../../sdk/program-error", version = "=2.2.0" }
solana-pubkey = { path = "../../../../../sdk/pubkey", version = "=2.2.0" }

[lib]
crate-type = ["cdylib"]

[patch.crates-io]
solana-decode-error = { path = "../../../../../sdk/decode-error" }
solana-instruction = { path = "../../../../../sdk/instruction" }
solana-pubkey = { path = "../../../../../sdk/pubkey" }

[workspace]
6 changes: 4 additions & 2 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/fail/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//! Example Rust-based SBF noop program
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
use {
solana_account_info::AccountInfo, solana_program_error::ProgramResult, solana_pubkey::Pubkey,
};

solana_program::entrypoint!(process_instruction);
solana_program_entrypoint::entrypoint!(process_instruction);
fn process_instruction(
_program_id: &Pubkey,
_accounts: &[AccountInfo],
Expand Down
9 changes: 4 additions & 5 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/noop/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ edition = "2021"
publish = false

[dependencies]
solana-program = { path = "../../../../../sdk/program", version = "=2.2.0" }
solana-account-info= { path = "../../../../../sdk/account-info", version = "=2.2.0" }
solana-program-entrypoint = { path = "../../../../../sdk/program-entrypoint", version = "=2.2.0" }
solana-program-error= { path = "../../../../../sdk/program-error", version = "=2.2.0" }
solana-pubkey = { path = "../../../../../sdk/pubkey", version = "=2.2.0" }

[lib]
crate-type = ["cdylib"]

[patch.crates-io]
solana-decode-error = { path = "../../../../../sdk/decode-error" }
solana-instruction = { path = "../../../../../sdk/instruction" }
solana-pubkey = { path = "../../../../../sdk/pubkey" }

[workspace]
6 changes: 4 additions & 2 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/noop/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//! Example Rust-based SBF noop program
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
use {
solana_account_info::AccountInfo, solana_program_error::ProgramResult, solana_pubkey::Pubkey,
};

solana_program::entrypoint!(process_instruction);
solana_program_entrypoint::entrypoint!(process_instruction);
fn process_instruction(
_program_id: &Pubkey,
_accounts: &[AccountInfo],
Expand Down
10 changes: 4 additions & 6 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ tools-version = "v1.43"
program-id = "MyProgram1111111111111111111111111111111111"

[dependencies]
solana-account-info= { path = "../../../../../sdk/account-info", version = "=2.2.0" }
solana-package-metadata = { path = "../../../../../sdk/package-metadata", version = "=2.2.0" }
solana-program = { path = "../../../../../sdk/program", version = "=2.2.0" }
solana-program-entrypoint = { path = "../../../../../sdk/program-entrypoint", version = "=2.2.0" }
solana-program-error= { path = "../../../../../sdk/program-error", version = "=2.2.0" }
solana-pubkey = { path = "../../../../../sdk/pubkey", version = "=2.2.0" }

[lib]
crate-type = ["cdylib"]

[patch.crates-io]
solana-decode-error = { path = "../../../../../sdk/decode-error" }
solana-instruction = { path = "../../../../../sdk/instruction" }
solana-pubkey = { path = "../../../../../sdk/pubkey" }

[workspace]
8 changes: 6 additions & 2 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/package-metadata/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
//! Example Rust-based SBF noop program
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
use {
solana_account_info::AccountInfo,
solana_program_error::ProgramResult,
solana_pubkey::Pubkey
};

solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
solana_program::entrypoint!(process_instruction);
solana_program_entrypoint::entrypoint!(process_instruction);
fn process_instruction(
_program_id: &Pubkey,
_accounts: &[AccountInfo],
Expand Down
10 changes: 4 additions & 6 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@ edition = "2021"
publish = false

[dependencies]
solana-program = { path = "../../../../../sdk/program", version = "=2.2.0" }
solana-account-info= { path = "../../../../../sdk/account-info", version = "=2.2.0" }
solana-program-entrypoint = { path = "../../../../../sdk/program-entrypoint", version = "=2.2.0" }
solana-program-error= { path = "../../../../../sdk/program-error", version = "=2.2.0" }
solana-pubkey = { path = "../../../../../sdk/pubkey", version = "=2.2.0" }

[lib]
crate-type = ["cdylib"]

[patch.crates-io]
solana-decode-error = { path = "../../../../../sdk/decode-error" }
solana-instruction = { path = "../../../../../sdk/instruction" }
solana-pubkey = { path = "../../../../../sdk/pubkey" }

[workspace]

[workspace.metadata.solana]
Expand Down
8 changes: 6 additions & 2 deletions platform-tools-sdk/cargo-build-sbf/tests/crates/workspace-metadata/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
//! Example Rust-based SBF noop program
use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey};
use {
solana_account_info::AccountInfo,
solana_program_error::ProgramResult,
solana_pubkey::Pubkey
};

solana_program::entrypoint!(process_instruction);
solana_program_entrypoint::entrypoint!(process_instruction);
fn process_instruction(
_program_id: &Pubkey,
_accounts: &[AccountInfo],
Expand Down

0 comments on commit 0502247

Please sign in to comment.