mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
pull/425/head
Christoph Jentzsch 10 years ago
parent f1de1cc97a 32f0c47c68
commit 89675a7153
2 changed files with 69 additions and 69 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 132
      TrieTests/trietest.json
  2. 6
      VMTests/vmIOandFlowOperationsTest.json

132
TrieTests/trietest.json
Unescape View File

@ -1,84 +1,84 @@
{ {
"singleItem": { "singleItem": {
"in": { "in": [
"A": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
}, ],
"root": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab" "root": "0xd23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
}, },
"dogs": { "dogs": {
"in": { "in": [
"doe": "reindeer", ["doe", "reindeer"],
"dog": "puppy", ["dog", "puppy"],
"dogglesworth": "cat" ["dogglesworth", "cat"]
}, ],
"root": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3" "root": "0x8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3"
}, },
"puppy": { "puppy": {
"in": { "in": [
"do": "verb", ["do", "verb"],
"horse": "stallion", ["horse", "stallion"],
"doge": "coin", ["doge", "coin"],
"dog": "puppy" ["dog", "puppy"]
}, ],
"root": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" "root": "0x5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84"
}, },
"emptyValues": { "emptyValues": {
"in": { "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", ""]
}, ],
"root": "4505cb6d817068bcd68fb225ab4d5ab70860461d3b35738bf6bcf7b44d702d0d" "root": "0x4505cb6d817068bcd68fb225ab4d5ab70860461d3b35738bf6bcf7b44d702d0d"
}, },
"foo": { "foo": {
"in": { "in": [
"foo": "bar", ["foo", "bar"],
"food": "bat", ["food", "bat"],
"food": "bass" ["food", "bass"]
}, ],
"root": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" "root": "0x17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3"
}, },
"smallValues": { "smallValues": {
"in": { "in": [
"be": "e", ["be", "e"],
"dog": "puppy", ["dog", "puppy"],
"bed": "d" ["bed", "d"]
}, ],
"root": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b" "root": "0x3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b"
}, },
"testy": { "testy": {
"in": { "in": [
"test": "test", ["test", "test"],
"te": "testy" ["te", "testy"]
}, ],
"root": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" "root": "0x8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928"
}, },
"hex": { "hex": {
"in": { "in": [
"0x0045": "0x0123456789", ["0x0045", "0x0123456789"],
"0x4500": "0x9876543210" ["0x4500", "0x9876543210"]
}, ],
"root": "285505fcabe84badc8aa310e2aae17eddc7d120aabec8a476902c8184b3a3503" "root": "0x285505fcabe84badc8aa310e2aae17eddc7d120aabec8a476902c8184b3a3503"
}, },
"jeff": { "jeff": {
"in": { "in": [
"0x0000000000000000000000000000000000000000000000000000000000000045": "0x22b224a1420a802ab51d326e29fa98e34c4f24ea", ["0x0000000000000000000000000000000000000000000000000000000000000045", "0x22b224a1420a802ab51d326e29fa98e34c4f24ea"],
"0x0000000000000000000000000000000000000000000000000000000000000046": "0x67706c2076330000000000000000000000000000000000000000000000000000", ["0x0000000000000000000000000000000000000000000000000000000000000046", "0x67706c2076330000000000000000000000000000000000000000000000000000"],
"0x0000000000000000000000000000000000000000000000000000001234567890": "0x697c7b8c961b56f675d570498424ac8de1a918f6", ["0x0000000000000000000000000000000000000000000000000000001234567890", "0x697c7b8c961b56f675d570498424ac8de1a918f6"],
"0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6": "0x1234567890", ["0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6", "0x1234567890"],
"0x0000000000000000000000007ef9e639e2733cb34e4dfc576d4b23f72db776b2": "0x4655474156000000000000000000000000000000000000000000000000000000", ["0x0000000000000000000000007ef9e639e2733cb34e4dfc576d4b23f72db776b2", "0x4655474156000000000000000000000000000000000000000000000000000000"],
"0x000000000000000000000000ec4f34c97e43fbb2816cfd95e388353c7181dab1": "0x4e616d6552656700000000000000000000000000000000000000000000000000", ["0x000000000000000000000000ec4f34c97e43fbb2816cfd95e388353c7181dab1", "0x4e616d6552656700000000000000000000000000000000000000000000000000"],
"0x4655474156000000000000000000000000000000000000000000000000000000": "0x7ef9e639e2733cb34e4dfc576d4b23f72db776b2", ["0x4655474156000000000000000000000000000000000000000000000000000000", "0x7ef9e639e2733cb34e4dfc576d4b23f72db776b2"],
"0x4e616d6552656700000000000000000000000000000000000000000000000000": "0xec4f34c97e43fbb2816cfd95e388353c7181dab1", ["0x4e616d6552656700000000000000000000000000000000000000000000000000", "0xec4f34c97e43fbb2816cfd95e388353c7181dab1"],
"0x0000000000000000000000000000000000000000000000000000001234567890": "", ["0x0000000000000000000000000000000000000000000000000000001234567890", ""],
"0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6": "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000", ["0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6", "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000"],
"0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000": "0x697c7b8c961b56f675d570498424ac8de1a918f6" ["0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000", "0x697c7b8c961b56f675d570498424ac8de1a918f6"]
}, ],
"root": "088c8e162c91c75ca9efa63f21530bbc6964cff7453a5d6af8404d090292a3e7" "root": "0x088c8e162c91c75ca9efa63f21530bbc6964cff7453a5d6af8404d090292a3e7"
} }
} }

6
VMTests/vmIOandFlowOperationsTest.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"dupAt51doesNotExistAnymore" : { "dupAt51becameMload" : {
"callcreates" : [ "callcreates" : [
], ],
"env" : { "env" : {
@ -1500,7 +1500,7 @@
} }
} }
}, },
"swapAt52doesNotExistAnymore" : { "swapAt52becameMstore" : {
"callcreates" : [ "callcreates" : [
], ],
"env" : { "env" : {
@ -1542,4 +1542,4 @@
} }
} }
} }
} }

Write Preview
Loading…
Cancel
Save