Skip to content

Commit acb431c

Browse files
Merge branch 'solana-developers:main' into poseidon-account-data
2 parents 05ffade + 45e302a commit acb431c

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

CONTRIBUTING.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ Specifically for code in this repo:
2222

2323
1. Use pnpm as the default package manager for the project. You can [install pnpm by following the instructions](https://pnpm.io/installation). Commit `pnpm-lock.yaml` to the repository.
2424

25-
2. Anchor programs should be in directory `anchor`, programs written for Solana Native should be in directory `native`, TypeScript in `posidon` and Python in `seahorse`.
25+
2. Anchor programs should be in directory `anchor`, programs written for Solana Native should be in directory `native`, TypeScript in `poseidon` and Python in `seahorse`.
2626

27-
3. Tests for Solana native, Steel and Anchor programs should be written with [ts-mocha](https://github.com/piotrwitek/ts-mocha).
27+
3. Tests for Solana native programs, steel framework programs, and Anchor should be written with [solana-bankrun](https://kevinheavey.github.io/solana-bankrun)
2828

29-
4. Tests for Solana native programs and steel framework programs should be written with [solana-bankrun](https://kevinheavey.github.io/solana-bankrun)
30-
31-
5. For Solana native programs and Steel framework programs ensure adding these mandatory pnpm run scripts to your `package.json` file for successful CI/CD builds:
29+
4. For Solana native programs and Steel framework programs ensure adding these mandatory pnpm run scripts to your `package.json` file for successful CI/CD builds:
3230

3331
```json
3432
"scripts": {
@@ -39,19 +37,20 @@ Specifically for code in this repo:
3937
},
4038
```
4139

42-
6. Test command for Anchor should execute `pnpm test` instead of `yarn run test` for anchor programs. Replace `yarn` with `pnpm` in `[script]` table inside [Anchor.toml file.](https://www.anchor-lang.com/docs/manifest#scripts-required-for-testing)
40+
5. Test command for Anchor should execute `pnpm test` instead of `yarn run test` for anchor programs. Replace `yarn` with `pnpm` in `[script]` table inside [Anchor.toml file.](https://www.anchor-lang.com/docs/manifest#scripts-required-for-testing)
4341

44-
7. TypeScript, JavaScript and JSON files are formatted and linted using
42+
6. TypeScript, JavaScript and JSON files are formatted and linted using
4543
[Biome](https://biomejs.dev/). Execute the following command to format and lint your code at the root of this project before submitting a pull request:
4644

47-
8. Some projects can be ignored from the building and testing process by adding the project name to the `.ghaignore` file.
48-
When removing or updating an example, please ensure that the example is removed from the `.ghaignore` file
49-
and there's a change in that example's directory.
50-
5145
```bash
5246
pnpm check:fix
5347
```
5448

49+
7. Some projects can be ignored from the building and testing process by adding the project name to the `.gitignore` file.
50+
When removing or updating an example, please ensure that the example is removed from the `.gitignore` file
51+
and there's a change in that example's directory.
52+
53+
5554
## Code of Conduct
5655

5756
We are committed to providing a friendly, safe, and welcoming environment for all contributors, regardless of their background, experience level, or personal characteristics. As a contributor, you are expected to:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Store and retrieve state in Solana.
8787

8888
[anchor](./basics/program-derived-addresses/anchor) [native](./basics/program-derived-addresses/native)
8989

90-
### Handling accounts that expland in size
90+
### Handling accounts that expand in size
9191

9292
How to store state that changes size in Solana.
9393

0 commit comments

Comments
 (0)