Skip to content

Commit

Permalink
Effect Refactor Continued (#317)
Browse files Browse the repository at this point in the history
* big lot of fixes

* changed web3 to http provider

* pkg changes

* restored WS

* fixed test reporting logic

* injected config

* undid config globalSetup

* fixed the doubleContext bug with 'test' cmd

* refactored run cmd

* progress?

* effecterized ws probe

* lint

* CI fix

* wrapped yargs

* removed logging

* updated packages

* new probe

* cleaned deps

* using native fetch

* added back node-fetch
  • Loading branch information
timbrinded authored Nov 23, 2023
1 parent 3787d4e commit 1465c9d
Show file tree
Hide file tree
Showing 52 changed files with 2,308 additions and 1,848 deletions.
32 changes: 10 additions & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ jobs:
test_dev:
runs-on: ubuntu-latest
needs: ["build"]
strategy:
matrix:
suite: ["dev_test", "dev_multi", "dev_seq"]
steps:
- uses: actions/checkout@v3
- uses: oven-sh/setup-bun@v1
Expand All @@ -122,25 +125,14 @@ jobs:
run: |
pnpm install
pnpm run build
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Download moonbeam binary
run: |
cd test
bun moonwall download moonbeam latest ./tmp
- name: Run standard dev test
run: |
cd test
bun moonwall test dev_test
- name: Run parallel dev test
run: |
cd test
bun moonwall test dev_multi
- name: Run sequential dev test
- name: Run dev test
run: |
cd test
bun moonwall test dev_seq
bun moonwall test ${{ matrix.suite }}
test_chopsticks:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -179,6 +171,9 @@ jobs:
test_readonly:
runs-on: ubuntu-latest
needs: ["build"]
strategy:
matrix:
suite: ["eth_test", "viem_test", "web3_test"]
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
Expand All @@ -195,17 +190,10 @@ jobs:
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Run standard ethers run
run: |
cd test
bun moonwall test eth_test
- name: Run standard viem run
- name: Run test
run: |
cd test
bun moonwall test viem_test
# disabled until web3.js fix their stuff
# - name: Run standard web3 run
# run: bun moonwall test web3_test
bun moonwall test ${{ matrix.suite }}
test_zombie:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ typechain-types
cache
artifacts
**/tmp/*
**/contracts/out/*
**/out
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"testing.automaticallyOpenPeekView": "never"
"testing.automaticallyOpenPeekView": "never",
"typescript.tsdk": "node_modules/typescript/lib"
}
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"vitepress": "1.0.0-rc.10"
},
"dependencies": {
"@algolia/client-search": ">=4.9.1 <6.0.0-0",
"search-insights": ">=1.0.0 <3.0.0-0"
"@algolia/client-search": "^4.20.0",
"search-insights": "^2.10.0"
}
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"devDependencies": {
"@changesets/cli": "^2.26.2",
"@pnpm/eslint-config": "^1.1.0",
"@typescript-eslint/eslint-plugin": "^6.10.0",
"@typescript-eslint/parser": "^6.10.0",
"eslint": "^8.53.0",
"@typescript-eslint/eslint-plugin": "^6.12.0",
"@typescript-eslint/parser": "^6.12.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-xo": "^0.43.1",
"eslint-config-xo-typescript": "^1.0.1",
"prettier": "^2.8.8",
"typescript": "^5.2.2"
"prettier": "^3.1.0",
"typescript": "^5.3.2"
}
}
4 changes: 2 additions & 2 deletions packages/cli/moonwall.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env -S node --no-warnings
#!/usr/bin/env -S node

import './dist/cmds/entrypoint.js'
import './dist/cmds/entrypoint.js'
45 changes: 25 additions & 20 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,20 @@
"prepublish": "pnpm run build && pnpm run generate-types"
},
"dependencies": {
"@acala-network/chopsticks": "^0.9.1",
"@acala-network/chopsticks": "^0.9.2",
"@moonbeam-network/api-augment": "^0.2600.0",
"@moonwall/types": "workspace:*",
"@moonwall/util": "workspace:*",
"@polkadot/api": "^10.10.1",
"@polkadot/api-augment": "^10.10.1",
"@polkadot/api-derive": "^10.10.1",
"@polkadot/keyring": "^12.5.1",
"@polkadot/types": "^10.10.1",
"@polkadot/types-codec": "^10.10.1",
"@polkadot/util": "^12.5.1",
"@polkadot/util-crypto": "^12.5.1",
"@polkadot/api": "^10.11.1",
"@polkadot/api-augment": "^10.11.1",
"@polkadot/api-derive": "^10.11.1",
"@polkadot/keyring": "^12.6.1",
"@polkadot/types": "^10.11.1",
"@polkadot/types-codec": "^10.11.1",
"@polkadot/util": "^12.6.1",
"@polkadot/util-crypto": "^12.6.1",
"@types/ws": "^8.5.10",
"@vitest/ui": "1.0.0-beta.5",
"@zombienet/orchestrator": "^0.0.62",
"@zombienet/utils": "^0.0.24",
"bottleneck": "^2.19.5",
Expand All @@ -82,32 +84,35 @@
"colors": "^1.4.0",
"debug": "^4.3.4",
"dotenv": "^16.3.1",
"effect": "2.0.0-next.54",
"ethers": "^6.8.1",
"effect": "2.0.0-next.56",
"ethers": "6.8.1",
"execa": "^8.0.1",
"inquirer": "^9.2.12",
"inquirer-press-to-continue": "^1.2.0",
"jsonc-parser": "^3.2.0",
"minimatch": "^9.0.3",
"node-fetch": "^3.3.2",
"semver": "^7.5.4",
"viem": "^1.18.9",
"vitest": "1.0.0-beta.4",
"viem": "^1.19.6",
"vitest": "1.0.0-beta.5",
"web3": "4.2.2",
"web3-providers-ws": "4.0.7",
"ws": "^8.14.2",
"yaml": "^2.3.4",
"yargs": "^17.7.2"
},
"peerDependencies": {
"@vitest/ui": "1.0.0-beta.5",
"vitest": "1.0.0-beta.5"
},
"devDependencies": {
"@types/cli-progress": "^3.11.5",
"@types/debug": "^4.1.12",
"@types/node": "^20.9.0",
"@types/yargs": "^17.0.31",
"prettier": "^3.0.3",
"tsup": "^7.2.0",
"tsx": "^4.1.0",
"typescript": "^5.2.2"
"@types/node": "^20.9.4",
"@types/yargs": "^17.0.32",
"prettier": "^3.1.0",
"tsup": "^8.0.1",
"tsx": "^4.2.0",
"typescript": "^5.3.2"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 1465c9d

Please sign in to comment.