Skip to content

Commit

Permalink
fix: failing ci tests for SmartProvider and OpStackIsm.t.sol (#3148)
Browse files Browse the repository at this point in the history
### Description

- Problem: OpStackIsm.t.sol was failing because of very stale block
number for fork
Fix: Excluding foundry fork testing  from CI and updating block number

- Problem: SmartProvider getLogs tests failing because the the results
end up being an empty list and getConfirmations results a smaller number
of confirmations than expected (712 vs 1705184)
fix: excluded from ci

### Drive-by changes

None

### Related issues

None

### Backward compatibility

Yes

### Testing

Manual
  • Loading branch information
aroralanuk authored Jan 12, 2024
1 parent 8d8ba3f commit 9561931
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
key: ${{ github.sha }}

- name: Unit Tests
run: yarn test
run: yarn test:ci

metadata-check:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -291,4 +291,4 @@ jobs:
- name: Upload coverage reports to Codecov with GitHub Action
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
token: ${{ secrets.CODECOV_TOKEN }}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"prettier": "yarn workspaces foreach --since --parallel run prettier",
"lint": "yarn workspaces foreach --since --parallel run lint",
"test": "yarn workspaces foreach --all --parallel run test",
"test:ci": "yarn workspaces foreach --all --parallel run test:ci",
"coverage": "yarn workspaces foreach --since --parallel run coverage",
"version:prepare": "yarn changeset version && yarn workspaces foreach --all --parallel run version:update && yarn install --no-immutable",
"version:check": "yarn changeset status",
Expand Down
4 changes: 2 additions & 2 deletions solidity/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ optimizer_runs = 999_999
verbosity = 4

[rpc_endpoints]
mainnet = "https://rpc.ankr.com/eth"
optimism = "https://rpc.ankr.com/optimism"
mainnet = "https://eth.merkle.io"
optimism = "https://optimism.llamarpc.com"
1 change: 1 addition & 0 deletions solidity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"storage": "./storage.sh",
"prettier": "prettier --write ./contracts ./test",
"test": "hardhat test && forge test -vvv",
"test:ci": "hardhat test && forge test --no-match-test testFork -vvv",
"gas": "forge snapshot",
"gas-ci": "yarn gas --check --tolerance 2 || (echo 'Manually update gas snapshot' && exit 1)",
"slither": "slither ."
Expand Down
4 changes: 2 additions & 2 deletions solidity/test/isms/OPStackIsm.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ contract OPStackIsmTest is Test {

function setUp() public {
// block numbers to fork from, chain data is cached to ../../forge-cache/
mainnetFork = vm.createFork(vm.rpcUrl("mainnet"), 17_586_909);
optimismFork = vm.createFork(vm.rpcUrl("optimism"), 106_233_774);
mainnetFork = vm.createFork(vm.rpcUrl("mainnet"), 18_992_500);
optimismFork = vm.createFork(vm.rpcUrl("optimism"), 114_696_811);

testRecipient = new TestRecipient();

Expand Down
1 change: 1 addition & 0 deletions typescript/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"lint": "eslint . --ext .ts",
"prettier": "prettier --write ./src ./examples",
"test": "mocha --config .mocharc.json",
"test:ci": "yarn test",
"version:update": "echo \"export const VERSION = '$npm_package_version';\" > src/version.ts"
},
"files": [
Expand Down
1 change: 1 addition & 0 deletions typescript/helloworld/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"lint": "solhint contracts/**/*.sol && eslint . --ext .ts",
"prettier": "prettier --write ./contracts ./src",
"test": "hardhat test ./src/test/**/*.test.ts",
"test:ci": "yarn test",
"sync": "ts-node scripts/sync-with-template-repo.ts"
},
"types": "dist/src/index.d.ts",
Expand Down
3 changes: 2 additions & 1 deletion typescript/infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@
"announce": "hardhat announce --network localhost",
"node": "hardhat node",
"prettier": "prettier --write *.ts ./src ./config ./scripts ./test",
"test": "mocha --config ../sdk/.mocharc.json test/agents.test.ts"
"test": "mocha --config ../sdk/.mocharc.json test/agents.test.ts",
"test:ci": "yarn test"
},
"peerDependencies": {
"@ethersproject/abi": "*"
Expand Down
1 change: 1 addition & 0 deletions typescript/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"prepublishOnly": "yarn build",
"prettier": "prettier --write ./src",
"test": "yarn test:unit && yarn test:hardhat && yarn test:foundry",
"test:ci": "yarn test:unit --exclude './src/**/SmartProvider.test.ts' && yarn test:hardhat && yarn test:foundry",
"test:unit": "mocha --config .mocharc.json './src/**/*.test.ts' --exit",
"test:hardhat": "hardhat test $(find ./src -name \"*.hardhat-test.ts\")",
"test:metadata": "ts-node ./src/test/metadata-check.ts",
Expand Down
3 changes: 2 additions & 1 deletion typescript/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"clean": "rm -rf ./dist",
"check": "tsc --noEmit",
"prettier": "prettier --write ./src",
"test": "mocha --config .mocharc.json './src/**/*.test.ts'"
"test": "mocha --config .mocharc.json './src/**/*.test.ts'",
"test:ci": "yarn test"
},
"sideEffects": false,
"types": "dist/index.d.ts",
Expand Down

0 comments on commit 9561931

Please sign in to comment.