Skip to content

Commit 5e4b384

Browse files
author
dwightguth
authored
Fix master build and add regression testing (#440)
* evm-node: update to latest version of plugin * Jenkinsfile: test firefly on PR * Dockerfile: add npm
1 parent 2eaba23 commit 5e4b384

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ RUN git clone 'https://github.com/z3prover/z3' --branch=z3-4.6.0 \
2222
&& cd ../.. \
2323
&& rm -rf z3
2424

25+
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
26+
RUN apt-get install --yes nodejs
27+
RUN npm install -g npx
28+
2529
USER user:user
2630

2731
ADD --chown=user:user deps/k/llvm-backend/src/main/native/llvm-backend/install-rust deps/k/llvm-backend/src/main/native/llvm-backend/rust-checksum /home/user/.install-rust/

Jenkinsfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ pipeline {
153153
'''
154154
}
155155
}
156+
stage('Firefly') {
157+
steps {
158+
sh '''
159+
export PATH=$PATH:$(pwd)/.build/defn/vm
160+
make test-interactive-firefly
161+
'''
162+
}
163+
}
156164
}
157165
}
158166
}

evm-node.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ Because the same account may be loaded more than once, implementations of this i
226226
- `extractConfig` takes a final configuration after rewriting and extracts a `vmResult` from it in order to abstract away configuration structure from the postprocessing done by the blockchain-k-plugin.
227227

228228
```{.k .node}
229-
syntax KItem ::= vmResult ( return: String , gas: Int , refund: Int , status: Int , selfdestruct: List , logs: List , AccountsCell , touched: List , statusCode: String )
229+
syntax KItem ::= vmResult ( return: String , gas: Int , refund: Int , status: Int , selfdestruct: Set , logs: List , AccountsCell , touched: Set , statusCode: String )
230230
syntax KItem ::= extractConfig() [function, symbol]
231231
// ---------------------------------------------------
232-
rule [[ extractConfig() => vmResult(#unparseByteStack(OUT), GAVAIL, REFUND, STATUS, Set2List(SD), LOGS, <accounts> ACCTS </accounts>, Set2List(TOUCHED), StatusCode2String(STATUSCODE)) ]]
232+
rule [[ extractConfig() => vmResult(#unparseByteStack(OUT), GAVAIL, REFUND, STATUS, SD, LOGS, <accounts> ACCTS </accounts>, TOUCHED, StatusCode2String(STATUSCODE)) ]]
233233
<output> OUT </output>
234234
<gas> GAVAIL </gas>
235235
<refund> REFUND </refund>

0 commit comments

Comments
 (0)