diff options
| author | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-06 03:24:26 +0800 |
|---|---|---|
| committer | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-11-06 03:24:26 +0800 |
| commit | 8e6bfb1fb344cf26fc60973086f3116927d3bf43 (patch) | |
| tree | b4a0a25d0dbd8bf0bf459b52f1e85cb39636fab9 /vmSha3TestFiller.json | |
| parent | 1d156a5726bc8c1eadc8b8297aa10f5212990e52 (diff) | |
| parent | d59a648985274fa587e9f0b69f681ea240ac8d1c (diff) | |
| download | dexon-solidity-8e6bfb1fb344cf26fc60973086f3116927d3bf43.tar.gz dexon-solidity-8e6bfb1fb344cf26fc60973086f3116927d3bf43.tar.zst dexon-solidity-8e6bfb1fb344cf26fc60973086f3116927d3bf43.zip | |
Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
test/vm.cpp
test/vmArithmeticTestFiller.json
test/vmSha3TestFiller.json
Diffstat (limited to 'vmSha3TestFiller.json')
| -rw-r--r-- | vmSha3TestFiller.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vmSha3TestFiller.json b/vmSha3TestFiller.json index beb1ea22..7ed72952 100644 --- a/vmSha3TestFiller.json +++ b/vmSha3TestFiller.json @@ -111,7 +111,7 @@ } }, - "sha3_3": { + "sha3_4": { "env" : { "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", "currentNumber" : "0", @@ -139,7 +139,7 @@ } }, - "sha3_4": { + "sha3_5": { "env" : { "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", "currentNumber" : "0", @@ -152,7 +152,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", "nonce" : 0, - "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 100)}", + "code" : "{ [[ 0 ]] (SHA3 10000 0xfffffffff )}", "storage": {} } }, @@ -167,7 +167,7 @@ } }, - "sha3_5": { + "sha3_6": { "env" : { "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", "currentNumber" : "0", @@ -180,7 +180,7 @@ "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { "balance" : "1000000000000000000", "nonce" : 0, - "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", "storage": {} } }, @@ -193,5 +193,5 @@ "gasPrice" : "100000000000000", "gas" : "10000" } - }, + } } |