Cleanup (#362)

* scaffolding tests

* rename test + fix payment manager usage fix build errors

* move provider to common

* fix build errors

* fix pda derivation

* fixing tests

* Remove anchor serialize on ctxs

* Reneable commented out test

* Rename account variable

* Remove chai

* Use wrapped sol in common

* Remove buffer utils

* Move metaplex to dev dep

* Remove wrappedSol import

* add CI key

* fix CI

* fix build

Co-authored-by: jpbogle <jpbogle22@gmail.com>

.eslintrc.js

@@ -1,14 +1,52 @@
-require("@rushstack/eslint-patch/modern-module-resolution");
-
 module.exports = {
  root: true,
- ignorePatterns: ["dist/", "*.js", "api", "tools"],
+ ignorePatterns: ["dist/", "*.js", "api/"],
+ parser: "@typescript-eslint/parser",
+ plugins: ["simple-import-sort", "import", "unused-imports"],
  parserOptions: {
  tsconfigRootDir: __dirname,
  project: "tsconfig.json",
  },
- extends: ["@saberhq"],
+ extends: [
+ "eslint:recommended",
+ "plugin:@typescript-eslint/recommended",
+ "plugin:@typescript-eslint/recommended-requiring-type-checking",
+ "plugin:prettier/recommended",
+ ],
  env: {
  node: true,
  },
+ rules: {
+ eqeqeq: "warn",
+ "@typescript-eslint/explicit-member-accessibility": [
+ "error",
+ { accessibility: "no-public" },
+ ],
+ "import/order": "off",
+ "simple-import-sort/imports": "warn",
+ "simple-import-sort/exports": "warn",
+ "import/first": "warn",
+ "import/newline-after-import": "warn",
+ "import/no-duplicates": "warn",
+ "unused-imports/no-unused-imports": "error",
+ "@typescript-eslint/consistent-type-imports": "error",
+ "@typescript-eslint/no-unused-vars": [
+ "warn",
+ {
+ vars: "all",
+ varsIgnorePattern: "^_",
+ args: "after-used",
+ argsIgnorePattern: "^_",
+ },
+ ],
+ "@typescript-eslint/naming-convention": [
+ "error",
+ {
+ selector: "memberLike",
+ modifiers: ["private"],
+ format: ["camelCase"],
+ leadingUnderscore: "require",
+ },
+ ],
+ },
 };

.github/workflows/test.yml

@@ -15,11 +15,11 @@ permissions:
 
 env:
  CARGO_TERM_COLOR: always
- SOLANA_VERSION: 1.10.30
+ SOLANA_VERSION: 1.10.41
  RUST_TOOLCHAIN: nightly
  SOTERIA_VERSION: 0.0.0
  ANCHOR_GIT: https://github.com/project-serum/anchor
- ANCHOR_VERSION: 0.24.2
+ ANCHOR_VERSION: 0.25.0
 
 jobs:
  rust-clippy:
@@ -115,30 +115,23 @@ jobs:
 
  - name: Setup
  run: mkdir -p target/deploy
- - run: cp -r tests/test-keypairs/* target/deploy
- - run: anchor build
- - run: find . -type f -name "Anchor.toml" -exec sed -i'' -e "s/tests\/\*.spec.ts/tests\/\*.spec.ts --reporter mocha-junit-reporter --reporter-options mochaFile=.\/tests\/out.xml/g" {} +
+ - name: build
+ run: anchor build
 
  - name: Run tests
- run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so --bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so --bpf-program tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE ./target/deploy/cardinal_time_invalidator.so --bpf-program useZ65tbyvWpdYCLDJaegGK34Lnsi8S3jZdwx8122qp ./target/deploy/cardinal_use_invalidator.so --bpf-program trsMRg3GzFSNgC3tdhbuKUES8YvGtUBbzp5fjxLtVQW ./target/deploy/cardinal_transfer_authority.so --reset & echo $$! > validator.PID
+ run: solana-test-validator --url https://api.devnet.solana.com --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr --clone 3DFgpPFW6H5vjCaUg1crHg98dGUEUd3VcLiwada4jz1D --bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so --bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so --bpf-program tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE ./target/deploy/cardinal_time_invalidator.so --bpf-program useZ65tbyvWpdYCLDJaegGK34Lnsi8S3jZdwx8122qp ./target/deploy/cardinal_use_invalidator.so --bpf-program trsMRg3GzFSNgC3tdhbuKUES8YvGtUBbzp5fjxLtVQW ./target/deploy/cardinal_transfer_authority.so --reset & echo $$! > validator.PID
  - run: sleep 6
- - run: solana airdrop 1000 $(solana-keygen pubkey tests/test-key.json) --url http://localhost:8899
- - run: anchor test --skip-local-validator --provider.cluster localnet
- # - uses: dorny/test-reporter@v1
- # if: always()
- # with:
- # artifact: test-results
- # name: Local Tests
- # path: tests/*.json
- # reporter: mocha-json
- - name: upload-integration-tests
+ - run: yarn test
+
+ - name: Upload Test Results
  if: always()
  uses: actions/upload-artifact@v3
  with:
- name: Unit Test Results
+ name: Integration Tests
  path: tests/out.xml
- - name: publish-integration-tests
- uses: EnricoMi/publish-unit-test-result-action/composite@v1
+ - uses: dorny/test-reporter@v1
  if: always()
  with:
- files: tests/out.xml
+ name: Integration Tests Results
+ path: tests/out.xml
+ reporter: jest-junit

Anchor.toml

@@ -1,9 +1,6 @@
 anchor_version = "0.24.2"
 solana_version = "1.10.30"
 
-[scripts]
-test = "yarn mocha tests/**/*.spec.ts"
-
 [provider]
 cluster = "localnet"
 wallet = "./tests/test-key.json"

Makefile

@@ -9,14 +9,14 @@ install:
 
 build:
  anchor build
- yarn idl:generate
- yarn lint
+ yarn idl:generate && yarn lint && yarn build
 
 start:
  solana-test-validator --url https://api.mainnet-beta.solana.com \
  --clone metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s --clone PwDiXFxQsGra4sFFTT8r1QWRMd4vfumiWC1jfWNfdYT \
  --clone pmvYY6Wgvpe3DEj3UX1FcRpMx43sMLYLJrFTVGcqpdn --clone 355AtuHH98Jy9XFg5kWodfmvSfrhcxYUKGoJe8qziFNY \
  --clone crkdpVWjHWdggGgBuSyAqSmZUmAjYLzD435tcLDRLXr \
+ --clone 3DFgpPFW6H5vjCaUg1crHg98dGUEUd3VcLiwada4jz1D \
  --bpf-program mgr99QFMYByTqGPWmNqunV7vBLmWWXdSrHUfV8Jf3JM ./target/deploy/cardinal_token_manager.so \
  --bpf-program pcaBwhJ1YHp7UDA7HASpQsRUmUNwzgYaLQto2kSj1fR ./target/deploy/cardinal_paid_claim_approver.so \
  --bpf-program tmeEDp1RgoDtZFtx6qod3HkbQmv9LMe36uqKVvsLTDE ./target/deploy/cardinal_time_invalidator.so \
@@ -28,7 +28,7 @@ start:
  solana airdrop 1000 $(TEST_KEY) --url http://localhost:8899
 
 test:
- anchor test --skip-local-validator --skip-build --skip-deploy --provider.cluster localnet
+ yarn test
 
 stop:
  pkill solana-test-validator