diff options
author | Yoichi Hirai <i@yoichihirai.com> | 2018-03-22 18:31:14 +0800 |
---|---|---|
committer | Yoichi Hirai <i@yoichihirai.com> | 2018-03-22 18:31:14 +0800 |
commit | 8704ccb8cdf34e71fa8f450bc83bb5d92f198acc (patch) | |
tree | 3a61bb37e41ec5d5888efcf0fd4e25bb08d90ad5 /src/GeneralStateTestsFiller/stRevertTest | |
parent | 80bc4e1d6aed9cfd92938c42c976997d5d05bf47 (diff) | |
download | dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.gz dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.bz2 dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.lz dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.xz dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.tar.zst dexon-tests-8704ccb8cdf34e71fa8f450bc83bb5d92f198acc.zip |
Rename duplicated keys in filler JSON files
Diffstat (limited to 'src/GeneralStateTestsFiller/stRevertTest')
11 files changed, 79 insertions, 79 deletions
diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json index 452544dd8..450641860 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert2Filler.json @@ -35,8 +35,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "code" : "create in init code on depth = 1024. account should not be created", - "//code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1023)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1024. account should not be created", + "//1 code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1023)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103ff60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json index 7e7a8b298..690634c60 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/LoopCallsDepthThenRevert3Filler.json @@ -39,8 +39,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "10", - "code" : "create in init code on depth = 1023. account would be created", - "//code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1022)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", + "//0 code" : "create in init code on depth = 1023. account would be created", + "//1 code" : "{ (JUMPI 63 (EQ (SLOAD 0) 1022)) [[0]] (+ (SLOAD 0) 1) (CALL (GAS) 0xa000000000000000000000000000000000000000 0 0 0 0 0) (JUMPI 83 (LT (SLOAD 0) 1050)) (JUMPDEST) (MSTORE 0 0x600060006002f0) (CREATE 3 25 7) (JUMPDEST)}", "code" : "0x6103fe60005414603f576001600054016000556000600060006000600073a0000000000000000000000000000000000000005af15061041a600054106053575b66600060006002f0600052600760196003f0505b", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json index 03a554083..a274fd09b 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json @@ -142,8 +142,8 @@ } }, "transaction" : { - "// data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.", - "// data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG", + "//0 data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.", + "//1 data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG", "data" : [ "0x000000000000000000000000000000000000000000000000000000000000ea60", "0x000000000000000000000000000000000000000000000000000000000001ea60" diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json index 4bd233137..02569debf 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCreateFiller.json @@ -73,7 +73,7 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", - "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", + "// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 12 }", "code" : "{ (MSTORE 0 0x600160005560016000fd6011600155 ) [[1]](CREATE 1 17 15) [[0]] 12 }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json index 04f007cf6..ab9ebbba2 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeDirectCallFiller.json @@ -83,7 +83,7 @@ }, "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "1", - "code" : "!!! STRANGE: CALL works, but if called from 094... it wont work. even if gas is enough. seems to be OOG.", + "// code" : "!!! STRANGE: CALL works, but if called from 094... it wont work. even if gas is enough. seems to be OOG.", "code" : "{ [[0]] (CALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 14 }", "nonce" : "0", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json index ad2b6a9a4..049a8cad0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeFiller.json @@ -77,7 +77,7 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 11 }", + "// code" : "{ [[0]] 1 (REVERT 0 1) [[1]] 11 }", "code" : "0x600160005560016000fd6011600155", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json index 90f9ba163..c0d0a370e 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeMultipleSubCallsFiller.json @@ -384,8 +384,8 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "0", - "code" : "simple calls", - "code" : "call -> callA-> revert | callB -> revert | some code * and OOG scenarious", + "//0 code" : "simple calls", + "//1 code" : "call -> callA-> revert | callB -> revert | some code * and OOG scenarious", "code" : "{ [[10]](CALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[11]](CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[12]](CALL 50000 0xd000000000000000000000000000000000000000 0 0 0 0 0) [[4]]12 [[5]]12 }", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json index cdd9e834a..3ac0e44cb 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOG2Filler.json @@ -73,28 +73,28 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract B ", - "code" : "{", - "code" : " function callback(address x)", - "code" : " {", - "code" : " x.call(bytes4(sha3('stor()'))); ", - "code" : " }", - "code" : "}", - "code" : "", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " B caller = new B();", - "code" : " caller.callback(this);", - "code" : " s = 13;", - "code" : " s2 = 14;", - "code" : " return true;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//00 code" : "contract B ", + "//01 code" : "{", + "//02 code" : " function callback(address x)", + "//03 code" : " {", + "//04 code" : " x.call(bytes4(sha3('stor()'))); ", + "//05 code" : " }", + "//06 code" : "}", + "//07 code" : "", + "//08 code" : "contract A {", + "//09 code" : " int s;", + "//0a code" : " int s2;", + "//0b code" : " function run() returns (bool){", + "//0c code" : " B caller = new B();", + "//0d code" : " caller.callback(this);", + "//0e code" : " s = 13;", + "//0f code" : " s2 = 14;", + "//10 code" : " return true;", + "//11 code" : " }", + "//12 code" : " function stor() {", + "//13 code" : " s = 12;", + "//14 code" : " }", + "//15 code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f8061016b833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600081905550600e600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a723058201d40a4f4ab84c9ed5c1e6f9e4574875993931efb14de8c4fc6be556ceeef5cc20029a165627a7a72305820b3260ed34e660b9533216c5881783a6cc70a072f3dc8d26e835c4d14c3c2a7890029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json index a04132332..37977ff09 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertRemoteSubCallStorageOOGFiller.json @@ -72,27 +72,27 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract B ", - "code" : "{", - "code" : " function callback(address x)", - "code" : " {", - "code" : " x.call(bytes4(sha3('stor()'))); ", - "code" : " }", - "code" : "}", - "code" : "", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " B caller = new B();", - "code" : " caller.callback(this);", - "code" : " s2 = 13;", - "code" : " return true;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//00 code" : "contract B ", + "//01 code" : "{", + "//02 code" : " function callback(address x)", + "//03 code" : " {", + "//04 code" : " x.call(bytes4(sha3('stor()'))); ", + "//05 code" : " }", + "//06 code" : "}", + "//07 code" : "", + "//08 code" : "contract A {", + "//09 code" : " int s;", + "//0a code" : " int s2;", + "//0b code" : " function run() returns (bool){", + "//0c code" : " B caller = new B();", + "//0d code" : " caller.callback(this);", + "//0e code" : " s2 = 13;", + "//0f code" : " return true;", + "//10 code" : " }", + "//11 code" : " function stor() {", + "//12 code" : " s = 12;", + "//13 code" : " }", + "//14 code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c414610049578063c040622614610058575b610000565b346100005761005661007f565b005b346100005761006561008a565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b6000600060405161016f80610163833901809050604051809103906000f080156100005790508073ffffffffffffffffffffffffffffffffffffffff166373027f6d306040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001915050600060405180830381600087803b156100005760325a03f11561000057505050600d600181905550600191505b50905600606060405234610000575b610156806100196000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806373027f6d1461003e575b610000565b346100005761006f600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610071565b005b8073ffffffffffffffffffffffffffffffffffffffff1660405180807f73746f7228290000000000000000000000000000000000000000000000000000815250600601905060405180910390207c010000000000000000000000000000000000000000000000000000000090046040518163ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018090506000604051808303816000876161da5a03f192505050505b505600a165627a7a72305820db9c9d1f37fd36768131a0bf9687f465e15b0503452e603be6b6f07b70d72e260029a165627a7a72305820f8ff2f7feef24d01a1cc070e67db9e15ac34810c8e5d1c7f34f3c38148eeae900029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json index b273397e0..ff15a7fb5 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOG2Filler.json @@ -71,18 +71,18 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " function run() returns (bool){", - "code" : " stor();", - "code" : " s = 13;", - "code" : " s2 = 14;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//0 code" : "contract A {", + "//1 code" : " int s;", + "//2 code" : " int s2;", + "//3 code" : " function run() returns (bool){", + "//4 code" : " stor();", + "//5 code" : " s = 13;", + "//6 code" : " s2 = 14;", + "//7 code" : " }", + "//8 code" : " function stor() {", + "//9 code" : " s = 12;", + "//a code" : " }", + "//b code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029", "nonce" : "", "storage" : { diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json index 20ddd970a..2394858f0 100644 --- a/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertSubCallStorageOOGFiller.json @@ -72,19 +72,19 @@ }, "a000000000000000000000000000000000000000" : { "balance" : "1", - "code" : "contract A {", - "code" : " int s;", - "code" : " int s2;", - "code" : " int s3;", - "code" : " function run() returns (bool){", - "code" : " stor();", - "code" : " s2 = 13;", - "code" : " s3 = 14;", - "code" : " }", - "code" : " function stor() {", - "code" : " s = 12;", - "code" : " }", - "code" : "}", + "//0 code" : "contract A {", + "//1 code" : " int s;", + "//2 code" : " int s2;", + "//3 code" : " int s3;", + "//4 code" : " function run() returns (bool){", + "//5 code" : " stor();", + "//6 code" : " s2 = 13;", + "//7 code" : " s3 = 14;", + "//8 code" : " }", + "//9 code" : " function stor() {", + "//a code" : " s = 12;", + "//b code" : " }", + "//c code" : "}", "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029", "nonce" : "", "storage" : { |