Skip to content

Commit bba1cbb

Browse files
author
Everett Hildenbrandt
committed
evm, driver, tests/{*.out,proofs}: remove <callLog> cell for VMTests mode, disable checking callcreates keys
1 parent d937330 commit bba1cbb

File tree

5 files changed

+3
-19
lines changed

5 files changed

+3
-19
lines changed

driver.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ Note that `TEST` is sorted here so that key `"network"` comes before key `"pre"`
315315
// -------------------------------------------------------------------------------------------
316316
rule #postKeys => ( SetItem("post") SetItem("postState") )
317317
rule #allPostKeys => ( #postKeys SetItem("expect") SetItem("export") SetItem("expet") )
318-
rule #checkKeys => ( #allPostKeys SetItem("logs") SetItem("callcreates") SetItem("out") SetItem("gas")
318+
rule #checkKeys => ( #allPostKeys SetItem("logs") SetItem("out") SetItem("gas")
319319
SetItem("blockHeader") SetItem("transactions") SetItem("uncleHeaders") SetItem("genesisBlockHeader")
320320
)
321321
@@ -328,7 +328,7 @@ Note that `TEST` is sorted here so that key `"network"` comes before key `"pre"`
328328
```{.k .standalone}
329329
syntax Set ::= "#discardKeys" [function]
330330
// ----------------------------------------
331-
rule #discardKeys => ( SetItem("//") SetItem("_info") )
331+
rule #discardKeys => ( SetItem("//") SetItem("_info") SetItem("callcreates") )
332332
333333
rule <k> run TESTID : { KEY : _ , REST } => run TESTID : { REST } ... </k> requires KEY in #discardKeys
334334
```
@@ -354,7 +354,6 @@ State Manipulation
354354
<memoryUsed> _ => 0 </memoryUsed>
355355
<callDepth> _ => 0 </callDepth>
356356
<callStack> _ => .List </callStack>
357-
<callLog> _ => .Set </callLog>
358357
<program> _ => .Map </program>
359358
<programBytes> _ => .WordStack </programBytes>
360359
<id> _ => 0 </id>
@@ -718,14 +717,6 @@ Here we check the other post-conditions associated with an EVM test.
718717
rule <k> check "gas" : ((GLEFT:String) => #parseWord(GLEFT)) ... </k>
719718
rule <k> check "gas" : GLEFT => . ... </k> <gas> GLEFT </gas>
720719
721-
rule <k> check TESTID : { "callcreates" : CCREATES } => check "callcreates" : CCREATES ~> failure TESTID ... </k>
722-
// -----------------------------------------------------------------------------------------------------------------
723-
rule <k> check "callcreates" : { ("data" : (DATA:String)) , ("destination" : (ACCTTO:String)) , ("gasLimit" : (GLIMIT:String)) , ("value" : (VAL:String)) , .JSONList }
724-
=> check "callcreates" : { #parseAddr(ACCTTO) | #parseWord(GLIMIT) | #parseWord(VAL) | #parseByteStack(DATA) }
725-
...
726-
</k>
727-
rule <k> check "callcreates" : C:Call => . ... </k> <callLog> CL </callLog> requires C in CL
728-
729720
rule check TESTID : { "blockHeader" : BLOCKHEADER } => check "blockHeader" : BLOCKHEADER ~> failure TESTID
730721
// ----------------------------------------------------------------------------------------------------------
731722
rule <k> check "blockHeader" : { KEY : VALUE , REST } => check "blockHeader" : { KEY : VALUE } ~> check "blockHeader" : { REST } ... </k>

evm.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ In the comments next to each cell, we've marked which component of the YellowPap
4545
<output> .WordStack </output> // H_RETURN
4646
<callStack> .List </callStack>
4747
<interimStates> .List </interimStates>
48-
<callLog> .Set </callLog>
4948
<touchedAccounts> .Set </touchedAccounts>
5049
5150
<callState>

tests/interactive/gas-analysis/sumTo10.evm.out

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<interimStates>
3030
.List
3131
</interimStates>
32-
<callLog>
33-
.Set
34-
</callLog>
3532
<touchedAccounts>
3633
.Set
3734
</touchedAccounts>

tests/proofs

tests/templates/output-success.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<interimStates>
2626
.List
2727
</interimStates>
28-
<callLog>
29-
.Set
30-
</callLog>
3128
<touchedAccounts>
3229
.Set
3330
</touchedAccounts>

0 commit comments

Comments
 (0)