Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Update LLL code in tests to avoid using define-on-use variables #3401

Merged
merged 2 commits into from
Nov 29, 2016
Merged

Update LLL code in tests to avoid using define-on-use variables #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b26a3a6
Update LLL code in tests to avoid using define-on-use variables
axic Nov 5, 2016
2e1f511
Add LLL code fixes to EIP158 tests
axic Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions test/libethereum/StateTestsFiller/EIP150/Homestead/stQuadraticComplexityTestFiller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -132,7 +132,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -172,7 +172,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -212,7 +212,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -252,7 +252,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -292,7 +292,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -332,7 +332,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -372,7 +372,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }",
"code" : "{ [ 1 ] 42 (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -411,7 +411,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -459,7 +459,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -509,7 +509,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -557,7 +557,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -605,7 +605,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down
2 changes: 1 addition & 1 deletion test/libethereum/StateTestsFiller/EIP150/Homestead/stSystemOperationsTestFiller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000",
"code" : "{ (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down
26 changes: 13 additions & 13 deletions test/libethereum/StateTestsFiller/EIP158/Homestead/stQuadraticComplexityTestFiller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -132,7 +132,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALLCODE 1600 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -172,7 +172,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 1000) [i](+ @i 1) [[ 0 ]] (CREATE 1 0 50000) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -212,7 +212,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xffffffffffffffffffffffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 500 1 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -252,7 +252,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 2 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -292,7 +292,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 78200 3 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -332,7 +332,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -372,7 +372,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ [ 1 ] 42 (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }",
"code" : "{ [ 1 ] 42 (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 4 1 0 50000 1 50000) ) [[ 1 ]] @i [[ 2 ]] @1 }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -411,7 +411,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -459,7 +459,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) [[ 0 ]] (CALL 1564 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 50000 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -509,7 +509,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -557,7 +557,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down Expand Up @@ -605,7 +605,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffff",
"code" : "{ (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"code" : "{ (def 'i 0x80) (for {} (< @i 50) [i](+ @i 1) [[ 0 ]] (CALL 88250000000 0xaaa50000fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) ) [[ 1 ]] @i }",
"nonce" : "0",
"storage" : {
}
Expand Down
2 changes: 1 addition & 1 deletion test/libethereum/StateTestsFiller/EIP158/Homestead/stSystemOperationsTestFiller.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@

"bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "1000",
"code" : "{ (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"code" : "{ (def 'i 0x80) (for {} (< @i 10) [i](+ @i 1) [[ 0 ]](CALL 0xfffffffffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 50000 0 0) ) [[ 1 ]] @i}",
"nonce" : "0",
"storage" : {
}
Expand Down
Loading