Skip to content
This repository was archived by the owner on Nov 6, 2022. It is now read-only.

Commit f06ebc2

Browse files
Merge pull request #594 from OffchainLabs/function-centric-codegen
Function centric codegen
2 parents 6a911f4 + d7125de commit f06ebc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1149
-1475
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,15 @@ jobs:
9898
sudo npm install -g yarn && cd contracts && yarn install
9999
100100
- name: Make and test ArbOS
101-
run: make clean && make
101+
run: make clean && make -j ci compile_options="-w"
102102

103-
- name: Check if ArbOS changed
103+
- name: Check if ArbOS or replayTests changed
104104
run: git update-index --refresh && git diff-index HEAD --
105105

106106
- name: Create code-coverage files if supported for rust ${{ matrix.rust }}
107107
if: matrix.rust == 'nightly'
108108
run: |
109109
grcov . --binary-path ./target/release/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
110-
make coverage
111110
112111
- name: Upload to codecov.io
113112
uses: codecov/codecov-action@v1
@@ -124,7 +123,7 @@ jobs:
124123
steps:
125124
- name: Checkout
126125
uses: actions/checkout@v1
127-
126+
128127
- name: Install dependencies
129128
run: |
130129
sudo add-apt-repository -y ppa:longsleep/golang-backports
@@ -138,6 +137,7 @@ jobs:
138137
# git clone -b v6.11.4 https://github.com/facebook/rocksdb
139138
# cd rocksdb && make shared_lib && sudo make install
140139
#
140+
curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v1.7.0/gotestsum_1.7.0_linux_amd64.tar.gz" | sudo tar -xz -C /usr/local/bin gotestsum
141141
142142
- name: Clone Arbitrum
143143
run: |
@@ -147,6 +147,8 @@ jobs:
147147
- name: Copy over this branch's ArbOS
148148
run: |
149149
rm -r arbitrum/packages/arb-os/*
150+
# We'd need `make testlogs` to generate these files
151+
# cp -r testlogs/* arbitrum/packages/arb-avm-cpp/tests/arbos-cases/
150152
mv * arbitrum/packages/arb-os/ || true
151153
152154
- name: Build Arbitrum
@@ -158,14 +160,14 @@ jobs:
158160
159161
- name: Test Node's C++ Database
160162
run: |
161-
./arbitrum/packages/arb-avm-cpp/debug/bin/avm_tests
162-
163-
- name: Test Node's RPC
164-
run: |
165-
cd arbitrum/packages/arb-rpc-node/
166-
go test ./...
163+
./arbitrum/packages/arb-avm-cpp/build/bin/avm_tests
167164
168165
- name: Test Node's Core
169166
run: |
170167
cd arbitrum/packages/arb-node-core/
171-
go test ./...
168+
gotestsum --format testname | tee issues | grep FAIL
169+
170+
- name: Test Node's RPC
171+
run: |
172+
cd arbitrum/packages/arb-rpc-node/
173+
gotestsum --format testname | tee issues | grep FAIL

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ arb_os/contractTemplates.mini
1818
.idea
1919
evm-tests/.travis.yml
2020
evm-test-logs/*
21-
**.cov
2221
**.bkp
2322
**~
2423
lcov.info
@@ -34,3 +33,14 @@ arb_os/save_bridge_for_debugging.mini
3433
# Tooling
3534
flamegraph.svg
3635
perf.data
36+
**.dot
37+
38+
# coverage files
39+
**.all
40+
**.cov
41+
**.partial
42+
43+
# auto-generated files
44+
.make/
45+
arb_os/bridge_arbos_versions.mini
46+
arb_os/arbos-upgrade-base.mexe

Cargo.lock

Lines changed: 21 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ num-integer = "0.1"
3838
rustc-hex = "2.1.0"
3939
toml = "0.5.8"
4040
rayon = "1.5.1"
41+
petgraph = "0.6.0"
4142

4243
[features]
4344
sparse_buffers = []

0 commit comments

Comments
 (0)