From a4971b4c93926253df026f616b14a742d778b696 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Fri, 23 Dec 2016 21:04:19 +0300 Subject: fix gstatetest src for new solidity --- .../stSystemOperationsTest/Call10Filler.json | 4 +- .../CalltoReturn2Filler.json | 68 ++++++++++++++++++++++ .../callstatelessToReturn1Filler.json | 68 ---------------------- 3 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json delete mode 100644 src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json (limited to 'src/GeneralStateTestsFiller/stSystemOperationsTest') diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json index adb92ef0c..12c70f9e9 100644 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json @@ -43,7 +43,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" : { } @@ -65,4 +65,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json new file mode 100644 index 000000000..8526be1b8 --- /dev/null +++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json @@ -0,0 +1,68 @@ +{ + "CalltoReturn2" : { + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "256", + "currentGasLimit" : "10000000", + "currentNumber" : "0", + "currentTimestamp" : 1, + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "nonce" : "0", + "storage" : { + "0x" : "0x00" + } + } + } + } + ], + "pre" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALL 5000 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }", + "nonce" : "0", + "storage" : { + } + }, + "945304eb96065b2a98b57a48a06ae28d285a71b5" : { + "balance" : "23", + "code" : "0x6001600155603760005360026000f2", + "nonce" : "0", + "storage" : { + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", + "code" : "", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "" + ], + "gasLimit" : [ + "300000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", + "value" : [ + "100000" + ] + } + } +} diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json deleted file mode 100644 index a0905c8ee..000000000 --- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callstatelessToReturn1Filler.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "callstatelessToReturn1" : { - "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "256", - "currentGasLimit" : "10000000", - "currentNumber" : "0", - "currentTimestamp" : 1, - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" - }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], - "result" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "nonce" : "0", - "storage" : { - "0x" : "0x80" - } - } - } - } - ], - "pre" : { - "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (MSTORE 32 0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa ) [[ 0 ]] (CALLSTATELESS 500 0x945304eb96065b2a98b57a48a06ae28d285a71b5 23 0 64 0 2 ) }", - "nonce" : "0", - "storage" : { - } - }, - "945304eb96065b2a98b57a48a06ae28d285a71b5" : { - "balance" : "23", - "code" : "0x6001600155603760005360026000f2", - "nonce" : "0", - "storage" : { - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", - "code" : "", - "nonce" : "0", - "storage" : { - } - } - }, - "transaction" : { - "data" : [ - "" - ], - "gasLimit" : [ - "300000" - ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", - "value" : [ - "100000" - ] - } - } -} \ No newline at end of file -- cgit v1.2.3