@@ -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>
0 commit comments