Removed arrays from Trie tests JSON as per conformance guide and changed

vocabulary to match other tests.
VM test updates.
This commit is contained in:
Gav Wood 2014-06-27 18:18:24 +02:00
parent 9345bc13d4
commit c818d13202
2 changed files with 45 additions and 49 deletions

View File

@ -1,61 +1,61 @@
{ {
"singleItem": { "singleItem": {
"inputs": [ "in": {
["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] "A": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
], },
"expectation": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab" "root": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
}, },
"dogs": { "dogs": {
"inputs": [ "in": {
["doe", "reindeer"], "doe": "reindeer",
["dog", "puppy"], "dog": "puppy",
["dogglesworth", "cat"] "dogglesworth": "cat"
], },
"expectation": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3" "root": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
}, },
"puppy": { "puppy": {
"inputs":[ "in": {
["do", "verb"], "do": "verb",
["horse", "stallion"], "horse": "stallion",
["doge", "coin"], "doge": "coin",
["dog", "puppy"] "dog": "puppy"
], },
"expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" "root": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
}, },
"emptyValues": { "emptyValues": {
"inputs":[ "in": {
["do", "verb"], "do": "verb",
["ether", "wookiedoo"], "ether": "wookiedoo",
["horse", "stallion"], "horse": "stallion",
["shaman", "horse"], "shaman": "horse",
["doge", "coin"], "doge": "coin",
["ether", ""], "ether": "",
["dog", "puppy"], "dog": "puppy",
["shaman", ""] "shaman": ""
], },
"expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" "root": "4505cb6d817068bcd68fb225ab4d5ab70860461d3b35738bf6bcf7b44d702d0d"
}, },
"foo": { "foo": {
"inputs":[ "in": {
["foo", "bar"], "foo": "bar",
["food", "bat"], "food": "bat",
["food", "bass"] "food": "bass"
], },
"expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" "root": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
}, },
"smallValues": { "smallValues": {
"inputs":[ "in": {
["be", "e"], "be": "e",
["dog", "puppy"], "dog": "puppy",
["bed", "d"] "bed": "d"
], },
"expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b" "root": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
}, },
"testy": { "testy": {
"inputs":[ "in": {
["test", "test"], "test": "test",
["te", "testy"] "te": "testy"
], },
"expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" "root": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
} }
} }

View File

@ -10,7 +10,6 @@
} }
], ],
"env" : { "env" : {
"code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256", "currentDifficulty" : "256",
"currentGasLimit" : "1000000", "currentGasLimit" : "1000000",
@ -125,7 +124,6 @@
} }
], ],
"env" : { "env" : {
"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)) )",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256", "currentDifficulty" : "256",
"currentGasLimit" : "1000000", "currentGasLimit" : "1000000",
@ -603,7 +601,6 @@
} }
], ],
"env" : { "env" : {
"code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256", "currentDifficulty" : "256",
"currentGasLimit" : "1000000", "currentGasLimit" : "1000000",
@ -704,7 +701,6 @@
"callcreates" : [ "callcreates" : [
], ],
"env" : { "env" : {
"code" : "(suicide (caller))",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256", "currentDifficulty" : "256",
"currentGasLimit" : "1000000", "currentGasLimit" : "1000000",