Skip to content

Commit 1fa5fa1

Browse files
authored
Remove kittchensink node from tests (#437)
1 parent 6fff02d commit 1fa5fa1

File tree

5 files changed

+21
-133
lines changed

5 files changed

+21
-133
lines changed

.github/scripts/matrices.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,13 @@ def __init__(
9999
n_partitions=2,
100100
pr_cross_platform=False,
101101
),
102-
Case(
103-
name="integration / polkadot_localnode",
104-
filter="(package(=cast) | package(=forge)) & test(/polkadot_localnode/)",
105-
n_partitions=1,
106-
pr_cross_platform=False,
107-
),
102+
# TODO: run the local node tests on polkadot-anvil
103+
# Case(
104+
# name="integration / polkadot_localnode",
105+
# filter="(package(=cast) | package(=forge)) & test(/polkadot_localnode/)",
106+
# n_partitions=1,
107+
# pr_cross_platform=False,
108+
# ),
108109
]
109110

110111

.github/workflows/nextest.yml

Lines changed: 2 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ env:
1717
RESOLC_VERSION: 0.3.0
1818
DLRP_API_KEY: ${{ secrets.DLRP_API_KEY }}
1919
ETHERSCAN_API_KEYS: ${{ secrets.ETHERSCAN_API_KEYS }}
20-
ETH_RPC_VERSION: 0.5.0
21-
SUBSTRATE_NODE_COMMIT_SHA: f4dba53bfac614b054735aa725d2b0c44efda414
20+
SNAPSHOTS: overwrite
2221

2322
jobs:
2423
matrices:
@@ -41,107 +40,11 @@ jobs:
4140
echo "::debug::test-matrix=$output"
4241
echo "test-matrix=$output" >> $GITHUB_OUTPUT
4342
44-
cache-binaries:
45-
name: cache binaries (${{ matrix.os }})
46-
runs-on: ${{ matrix.runner }}
47-
timeout-minutes: 120
48-
strategy:
49-
fail-fast: false
50-
matrix:
51-
include:
52-
- os: ubuntu
53-
runner: parity-large-new
54-
- os: macos
55-
runner: macos-latest
56-
- os: windows
57-
runner: windows-latest
58-
steps:
59-
- uses: actions/checkout@v4
60-
- uses: dtolnay/rust-toolchain@1.88.0
61-
62-
# Check existing caches first
63-
- name: Cache substrate-node binary
64-
id: cache-substrate
65-
uses: actions/cache@v4
66-
with:
67-
path: polkadot-sdk/target/release/substrate-node${{ matrix.os == 'windows' && '.exe' || '' }}
68-
key: substrate-node-${{ matrix.runner }}-${{ env.SUBSTRATE_NODE_COMMIT_SHA }}
69-
70-
- name: Cache eth-rpc binary
71-
id: cache-ethrpc
72-
uses: actions/cache@v4
73-
with:
74-
path: ~/.cargo/bin/eth-rpc${{ matrix.os == 'windows' && '.exe' || '' }}
75-
key: eth-rpc-${{ matrix.runner }}-${{ env.ETH_RPC_VERSION }}
76-
77-
# Install dependencies for building
78-
- name: Install clang on ubuntu
79-
if: matrix.os == 'ubuntu'
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install -y clang libclang-dev unzip build-essential
83-
84-
- name: Install protobuf-compiler
85-
uses: arduino/setup-protoc@v3
86-
with:
87-
repo-token: ${{ secrets.GITHUB_TOKEN }}
88-
89-
# macOS-specific setup
90-
- name: Install libusb 1.0.27 (macOS)
91-
if: matrix.os == 'macos'
92-
run: |
93-
brew install autoconf automake libtool pkg-config
94-
wget https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2
95-
tar -xvjf libusb-1.0.27.tar.bz2
96-
cd libusb-1.0.27
97-
./configure --prefix=/usr/local
98-
make
99-
sudo make install
100-
101-
- name: Install clang (macOS)
102-
if: matrix.os == 'macos'
103-
run: |
104-
brew install llvm
105-
brew link llvm
106-
echo "LLVM_CONFIG_PATH=$(brew --prefix llvm)/bin/llvm-config" >> $GITHUB_ENV
107-
echo "LIBCLANG_PATH=$(brew --prefix llvm)/lib" >> $GITHUB_ENV
108-
109-
- name: Install Rust toolchain
110-
uses: dtolnay/rust-toolchain@1.88.0
111-
with:
112-
target: ${{ matrix.target }}, wasm32-unknown-unknown
113-
components: rust-src
114-
115-
# Build substrate-node (if not cached)
116-
- name: Build substrate-node
117-
if: steps.cache-substrate.outputs.cache-hit != 'true' && matrix.os == 'ubuntu'
118-
run: |
119-
git init polkadot-sdk
120-
cd polkadot-sdk
121-
git remote add origin https://github.com/paritytech/polkadot-sdk
122-
git fetch --depth 1 origin ${{ env.SUBSTRATE_NODE_COMMIT_SHA }}
123-
git checkout FETCH_HEAD
124-
cargo build --release --bin substrate-node
125-
126-
# Install eth-rpc proxy (if not cached)
127-
- name: Install eth-rpc proxy
128-
if: steps.cache-ethrpc.outputs.cache-hit != 'true' && matrix.os == 'ubuntu'
129-
run: cargo install pallet-revive-eth-rpc --version ${{ env.ETH_RPC_VERSION }} --locked
130-
131-
# Verify binaries exist
132-
- name: Verify binaries
133-
if: matrix.os == 'ubuntu'
134-
run: |
135-
echo "=== Substrate binary ==="
136-
ls -lh polkadot-sdk/target/release/substrate-node || echo "substrate-node not found"
137-
echo "=== eth-rpc binary ==="
138-
ls -lh ~/.cargo/bin/eth-rpc || echo "eth-rpc not found"
139-
14043
test:
14144
name: test ${{ matrix.name }}
14245
runs-on: ${{ matrix.runner_label }}
14346
timeout-minutes: 90
144-
needs: [matrices, cache-binaries]
47+
needs: [matrices]
14548
strategy:
14649
fail-fast: false
14750
matrix: ${{ fromJson(needs.matrices.outputs.test-matrix) }}
@@ -151,21 +54,6 @@ jobs:
15154
steps:
15255
- uses: actions/checkout@v4
15356
- uses: taiki-e/install-action@nextest
154-
155-
- name: Restore substrate-node binary
156-
uses: actions/cache/restore@v4
157-
with:
158-
path: polkadot-sdk/target/release/substrate-node${{ contains(matrix.runner_label, 'windows') && '.exe' || '' }}
159-
key: substrate-node-${{ matrix.runner_label }}-${{ env.SUBSTRATE_NODE_COMMIT_SHA }}
160-
fail-on-cache-miss: ${{ contains(matrix.runner_label, 'ubuntu') }}
161-
162-
- name: Restore eth-rpc binary
163-
uses: actions/cache/restore@v4
164-
with:
165-
path: ~/.cargo/bin/eth-rpc${{ contains(matrix.runner_label, 'windows') && '.exe' || '' }}
166-
key: eth-rpc-${{ matrix.runner_label }}-${{ env.ETH_RPC_VERSION }}
167-
fail-on-cache-miss: ${{ contains(matrix.runner_label, 'ubuntu') }}
168-
16957
- name: Install dependencies for building (Ubuntu)
17058
if: contains(matrix.runner_label, 'parity-large-new')
17159
run: |
@@ -207,9 +95,6 @@ jobs:
20795
rvm install ${{ env.RESOLC_VERSION }}
20896
rvm use ${{ env.RESOLC_VERSION }}
20997
210-
- name: Add substrate-node to $PATH
211-
run: echo "${{github.workspace}}/polkadot-sdk/target/release" >> $GITHUB_PATH
212-
21398
- name: Check Resolc Version
21499
run: resolc --version
215100

.github/workflows/test.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,22 @@ jobs:
2323
secrets: inherit
2424

2525
docs:
26-
runs-on: ubuntu-latest
27-
timeout-minutes: 30
26+
runs-on: parity-large-new
27+
timeout-minutes: 60
2828
steps:
2929
- uses: actions/checkout@v4
3030
- uses: dtolnay/rust-toolchain@nightly
31+
with:
32+
targets: wasm32-unknown-unknown
33+
components: rust-src
34+
- name: Install build tools
35+
run: |
36+
sudo apt-get update
37+
sudo apt-get install -y clang libclang-dev unzip build-essential
3138
- name: Install protobuf-compiler
3239
uses: arduino/setup-protoc@v3
3340
with:
3441
repo-token: ${{ secrets.GITHUB_TOKEN }}
35-
- uses: dtolnay/rust-toolchain@1.88.0
36-
with:
37-
target: wasm32-unknown-unknown
38-
components: rust-src
39-
toolchain: nightly-x86_64-unknown-linux-gnu
4042
- name: Install clang on ubuntu
4143
run: |
4244
sudo apt-get update

crates/forge/tests/cli/cmd.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2933,7 +2933,7 @@ contract NestedDeploy is Test {
29332933
+============================================================================================+
29342934
| Deployment Cost | Deployment Size | | | | |
29352935
|-------------------------------------------+-----------------+-----+--------+-----+---------|
2936-
| 328949 | 1163 | | | | |
2936+
| 328961 | 1163 | | | | |
29372937
|-------------------------------------------+-----------------+-----+--------+-----+---------|
29382938
| | | | | | |
29392939
|-------------------------------------------+-----------------+-----+--------+-----+---------|
@@ -2988,7 +2988,7 @@ Ran 1 test suite [ELAPSED]: 1 tests passed, 0 failed, 0 skipped (1 total tests)
29882988
{
29892989
"contract": "test/NestedDeployTest.sol:Parent",
29902990
"deployment": {
2991-
"gas": 328949,
2991+
"gas": 328961,
29922992
"size": 1163
29932993
},
29942994
"functions": {

testdata/forge-std-rev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8e40513d678f392f398620b3ef2b418648b33e89
1+
7117c90c8cf6c68e5acce4f09a6b24715cea4de6

0 commit comments

Comments
 (0)