Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/.ghaignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# build and test error
basics/realloc/native
basics/cross-program-invocation/native

# uses generated client from shank, can't rewrite to solana-bankrun
tools/shank-and-solita/native

Expand Down
21 changes: 2 additions & 19 deletions basics/cross-program-invocation/native/package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
{
"type": "module",
"scripts": {
"test": "pnpm ts-mocha -p ./tsconfig.json -t 1000000 ./tests/test.ts",
"build-and-test": "cargo build-sbf --sbf-out-dir=./tests/fixtures && pnpm test",
"build": "cargo build-sbf --sbf-out-dir=./program/target/so",
"deploy": "solana program deploy ./program/target/so/program.so"
},
"dependencies": {
"@solana/web3.js": "^1.98.4",
"borsh": "^2.0.0",
"buffer": "^6.0.3",
"fs": "^0.0.1-security"
},
"devDependencies": {
"@types/bn.js": "^5.1.0",
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"chai": "^4.3.4",
"mocha": "^9.0.3",
"ts-mocha": "^10.0.0",
"typescript": "^4.3.5"
"build-and-test": "cargo build-sbf --manifest-path=./programs/lever/Cargo.toml --sbf-out-dir=./tests/fixtures && cargo build-sbf --manifest-path=./programs/hand/Cargo.toml --sbf-out-dir=./tests/fixtures",
"build": "cargo build-sbf --manifest-path=./programs/lever/Cargo.toml && cargo build-sbf --manifest-path=./programs/hand/Cargo.toml"
}
}
1,287 changes: 1 addition & 1,286 deletions basics/cross-program-invocation/native/pnpm-lock.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ fn test_cpi() {
let hand_program_id = Pubkey::new_unique();
let lever_program_id = Pubkey::new_unique();
let hand_program_bytes =
include_bytes!("../../../target/deploy/cross_program_invocatio_native_hand.so");
include_bytes!("../../../tests/fixtures/cross_program_invocatio_native_hand.so");
let lever_program_bytes =
include_bytes!("../../../target/deploy/cross_program_invocatio_native_lever.so");
include_bytes!("../../../tests/fixtures/cross_program_invocatio_native_lever.so");

let payer = Keypair::new();
let power_account = Keypair::new();
Expand Down
70 changes: 0 additions & 70 deletions basics/cross-program-invocation/native/tests/test.ts

This file was deleted.

10 changes: 0 additions & 10 deletions basics/cross-program-invocation/native/tsconfig.json

This file was deleted.

19 changes: 2 additions & 17 deletions basics/realloc/native/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
{
"type": "module",
"scripts": {
"test": "pnpm ts-mocha -p ./tests/tsconfig.test.json -t 1000000 ./tests/realloc.test.ts",
"build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures && pnpm test",
"build-and-test": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./tests/fixtures",
"build": "cargo build-sbf --manifest-path=./program/Cargo.toml --sbf-out-dir=./program/target/so",
"deploy": "solana program deploy ./program/target/so/program.so"
},
"dependencies": {
"@solana/web3.js": "^1.98.4",
"fs": "^0.0.1-security"
},
"devDependencies": {
"@types/bn.js": "^5.1.0",
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"chai": "^4.3.4",
"mocha": "^9.0.3",
"solana-bankrun": "^0.3.0",
"ts-mocha": "^10.0.0",
"typescript": "^4.3.5"
"deploy": "solana program deploy ./program/target/so/realloc_program.so"
}
}
Loading
Loading