diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-02-11 18:19:44 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-02-11 18:19:44 +0800 |
| commit | 87b0a1005207edca25ffc2f4f66c1f2d914521e7 (patch) | |
| tree | 37bc0805ba62352061c8e7ed56ef733f9aa66dd3 /vmtestsFiller.json | |
| parent | 4578732556684b3c7f24793d0459e2e8b40fe458 (diff) | |
| parent | 9a792edb33a95f8034cbb368e94e8ca0f4565415 (diff) | |
| download | dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar.gz dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar.bz2 dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar.lz dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar.xz dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.tar.zst dexon-solidity-87b0a1005207edca25ffc2f4f66c1f2d914521e7.zip | |
Merge remote-tracking branch 'upstream/develop' into blockTests
Conflicts:
test/transaction.cpp
Diffstat (limited to 'vmtestsFiller.json')
| -rw-r--r-- | vmtestsFiller.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vmtestsFiller.json b/vmtestsFiller.json index 6dce8bff..75bf1da8 100644 --- a/vmtestsFiller.json +++ b/vmtestsFiller.json @@ -5,13 +5,13 @@ "currentNumber" : "0", "currentGasLimit" : "1000000", "currentDifficulty" : "256", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" }, "pre" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", - "nonce" : 0, + "nonce" : "0", "code" : "(suicide (caller))", "storage": {} } @@ -33,13 +33,13 @@ "currentNumber" : "0", "currentGasLimit" : "1000000", "currentDifficulty" : "256", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" }, "pre" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", - "nonce" : 0, + "nonce" : "0", "code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }", "storage": {} } @@ -61,13 +61,13 @@ "currentNumber" : "0", "currentGasLimit" : "1000000", "currentDifficulty" : "256", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" }, "pre" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", - "nonce" : 0, + "nonce" : "0", "code" : "(seq (when (and 1 1) (call (- (gas) 200) (caller) 2 0 0 0 0)) (when (and 1 0) (call (- (gas) 200) (caller) 3 0 0 0 0)) (when (and 0 1) (call (- (gas) 200) (caller) 4 0 0 0 0)) (when (and 0 0) (call (- (gas) 200) (caller) 5 0 0 0 0)) (when (or 1 1) (call (- (gas) 200) (caller) 12 0 0 0 0)) (when (or 1 0) (call (- (gas) 200) (caller) 13 0 0 0 0)) (when (or 0 1) (call (- (gas) 200) (caller) 14 0 0 0 0)) (when (or 0 0) (call (- (gas) 200) (caller) 15 0 0 0 0)) )", "storage": {} } @@ -89,13 +89,13 @@ "currentNumber" : "0", "currentGasLimit" : "1000000", "currentDifficulty" : "256", - "currentTimestamp" : 1, + "currentTimestamp" : "1", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" }, "pre" : { "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", - "nonce" : 0, + "nonce" : "0", "code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)", "storage": {} } |