aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2014-06-28 00:18:24 +0800
committerGav Wood <i@gavwood.com>2014-06-28 00:18:24 +0800
commitc818d132022c228c5b04ab82871f5971049b0c6d (patch)
treea127c793499f5bd72495f6173a462d8e70bb1ef9
parent9345bc13d40e6d288c37b650ace1db0c41a89d84 (diff)
downloadgo-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar.gz
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar.bz2
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar.lz
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar.xz
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.tar.zst
go-tangerine-c818d132022c228c5b04ab82871f5971049b0c6d.zip
Removed arrays from Trie tests JSON as per conformance guide and changed
vocabulary to match other tests. VM test updates.
-rw-r--r--trietest.json90
-rw-r--r--vmtests.json4
2 files changed, 45 insertions, 49 deletions
diff --git a/trietest.json b/trietest.json
index c77e7eb8e..a8fb7ca86 100644
--- a/trietest.json
+++ b/trietest.json
@@ -1,61 +1,61 @@
{
"singleItem": {
- "inputs": [
- ["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
- ],
- "expectation": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
+ "in": {
+ "A": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ },
+ "root": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
},
"dogs": {
- "inputs": [
- ["doe", "reindeer"],
- ["dog", "puppy"],
- ["dogglesworth", "cat"]
- ],
- "expectation": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
+ "in": {
+ "doe": "reindeer",
+ "dog": "puppy",
+ "dogglesworth": "cat"
+ },
+ "root": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
},
"puppy": {
- "inputs":[
- ["do", "verb"],
- ["horse", "stallion"],
- ["doge", "coin"],
- ["dog", "puppy"]
- ],
- "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
+ "in": {
+ "do": "verb",
+ "horse": "stallion",
+ "doge": "coin",
+ "dog": "puppy"
+ },
+ "root": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
},
"emptyValues": {
- "inputs":[
- ["do", "verb"],
- ["ether", "wookiedoo"],
- ["horse", "stallion"],
- ["shaman", "horse"],
- ["doge", "coin"],
- ["ether", ""],
- ["dog", "puppy"],
- ["shaman", ""]
- ],
- "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
+ "in": {
+ "do": "verb",
+ "ether": "wookiedoo",
+ "horse": "stallion",
+ "shaman": "horse",
+ "doge": "coin",
+ "ether": "",
+ "dog": "puppy",
+ "shaman": ""
+ },
+ "root": "4505cb6d817068bcd68fb225ab4d5ab70860461d3b35738bf6bcf7b44d702d0d"
},
"foo": {
- "inputs":[
- ["foo", "bar"],
- ["food", "bat"],
- ["food", "bass"]
- ],
- "expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
+ "in": {
+ "foo": "bar",
+ "food": "bat",
+ "food": "bass"
+ },
+ "root": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
},
"smallValues": {
- "inputs":[
- ["be", "e"],
- ["dog", "puppy"],
- ["bed", "d"]
- ],
- "expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
+ "in": {
+ "be": "e",
+ "dog": "puppy",
+ "bed": "d"
+ },
+ "root": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
},
"testy": {
- "inputs":[
- ["test", "test"],
- ["te", "testy"]
- ],
- "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
+ "in": {
+ "test": "test",
+ "te": "testy"
+ },
+ "root": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
}
}
diff --git a/vmtests.json b/vmtests.json
index 4398e398b..33f0844c3 100644
--- a/vmtests.json
+++ b/vmtests.json
@@ -10,7 +10,6 @@
}
],
"env" : {
- "code" : "{ (call (- (gas) 200) (caller) (+ 2 2 (* 4 4 4) (/ 2 2) (% 3 2) (- 8 2 2)) 0 0 0 0) }",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentGasLimit" : "1000000",
@@ -125,7 +124,6 @@
}
],
"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",
"currentDifficulty" : "256",
"currentGasLimit" : "1000000",
@@ -603,7 +601,6 @@
}
],
"env" : {
- "code" : "(call (- (gas) 200) (caller) 500000000000000000 0 0 0 0)",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentGasLimit" : "1000000",
@@ -704,7 +701,6 @@
"callcreates" : [
],
"env" : {
- "code" : "(suicide (caller))",
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
"currentDifficulty" : "256",
"currentGasLimit" : "1000000",