Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
Conflicts:
	genesishashestest.json
  • Loading branch information
CJentzsch committed Oct 8, 2014
2 parents 4513623 + 1a67a96 commit dfe66ca
Show file tree
Hide file tree
Showing 16 changed files with 12,580 additions and 850 deletions.
2 changes: 1 addition & 1 deletion TODO
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Move over to standard & clear JSON format:
- Move over to standard and clear JSON format:

All files should be of the form:

Expand Down
8 changes: 4 additions & 4 deletions genesishashestest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a011cc4aaa3b2f97cd6c858fcc0903b9b34b071e1798c91645f0e05e267028cb4a80834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0",
"genesis_state_root": "11cc4aaa3b2f97cd6c858fcc0903b9b34b071e1798c91645f0e05e267028cb4a",
"genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a008bf6a98374f333b84e7d063d607696ac7cbbd409bd20fbe6a741c2dfc0eb28580830200008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0",
"genesis_state_root": "08bf6a98374f333b84e7d063d607696ac7cbbd409bd20fbe6a741c2dfc0eb285",
"initial_alloc": {
"51ba59315b3a95761d0863b05ccc7a7f54703d99": "1606938044258990275541962092341162602522202993782792835301376",
"e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376",
"1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376",
"b9c015918bdaba24b4ff057a92a3873d6eb201be": "1606938044258990275541962092341162602522202993782792835301376",
"6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376",
"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376",
"2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376",
"e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376",
"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376"
},
"genesis_hash": "56fff6ab5ef6f1ef8dafb7b4571b89a9ae1ab870e54197c59ea10ba6f2c7eb60"
"genesis_hash": "08436a4d33c77e6acf013e586a3333ad152f25d31df8b68749d85046810e1f4b"
}
55 changes: 55 additions & 0 deletions namecoin.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"namecoin": {
"pre": {
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
"nonce": "1",
"balance": "2500000000000000000",
"storage": {},
"code": "0x"
},
"c305c901078781c232a2a521c2af7980f8385ee9": {
"nonce": "0",
"balance": "0",
"storage": {},
"code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2"
}
},
"exec": {
"origin": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
"code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2",
"value": "0",
"address": "c305c901078781c232a2a521c2af7980f8385ee9",
"gas": "10000",
"caller": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
"data": "0x000000000000000000000000000000000000000000000000000000000000002d000000000000000000000000000000000000000000000000000000000000004e",
"gasPrice": "1000000000000"
},
"callcreates": [],
"gas": "9763",
"env": {
"currentTimestamp": "1405282164",
"currentGasLimit": "999023",
"previousHash": "112a6e7995fcb66376f44e52f011c38d328a9ed3a1dac6eebb1376fccd055fad",
"currentCoinbase": "82a978b3f5962a5b0957d9ee9eef472ee55b42f1",
"currentDifficulty": "4190208",
"currentNumber": "1"
},
"post": {
"82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
"nonce": "1",
"balance": "2500000000000000000",
"storage": {},
"code": "0x"
},
"c305c901078781c232a2a521c2af7980f8385ee9": {
"nonce": "0",
"balance": "0",
"storage": {
"0x2d": "0x4e"
},
"code": "0x600035560f0f601d5960203560003557600160005460206000f2602758600060205460206020f2"
}
},
"out": "0x0000000000000000000000000000000000000000000000000000000000000001"
}
}
115 changes: 69 additions & 46 deletions trietest.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,84 @@
{
"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"
},
"hex": {
"in": {
"0x0045": "0x0123456789",
"0x4500": "0x9876543210"
},
"root": "285505fcabe84badc8aa310e2aae17eddc7d120aabec8a476902c8184b3a3503"
},
"jeff": {
"in": {
"0x0000000000000000000000000000000000000000000000000000000000000045": "0x22b224a1420a802ab51d326e29fa98e34c4f24ea",
"0x0000000000000000000000000000000000000000000000000000000000000046": "0x67706c2076330000000000000000000000000000000000000000000000000000",
"0x0000000000000000000000000000000000000000000000000000001234567890": "0x697c7b8c961b56f675d570498424ac8de1a918f6",
"0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6": "0x1234567890",
"0x0000000000000000000000007ef9e639e2733cb34e4dfc576d4b23f72db776b2": "0x4655474156000000000000000000000000000000000000000000000000000000",
"0x000000000000000000000000ec4f34c97e43fbb2816cfd95e388353c7181dab1": "0x4e616d6552656700000000000000000000000000000000000000000000000000",
"0x4655474156000000000000000000000000000000000000000000000000000000": "0x7ef9e639e2733cb34e4dfc576d4b23f72db776b2",
"0x4e616d6552656700000000000000000000000000000000000000000000000000": "0xec4f34c97e43fbb2816cfd95e388353c7181dab1",
"0x0000000000000000000000000000000000000000000000000000001234567890": "",
"0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6": "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000",
"0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000": "0x697c7b8c961b56f675d570498424ac8de1a918f6"
},
"root": "088c8e162c91c75ca9efa63f21530bbc6964cff7453a5d6af8404d090292a3e7"
}
}
19 changes: 19 additions & 0 deletions trietestnextprev.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"basic": {
"in": [ "cat", "doge", "wallace" ],
"tests": [
[ "", "", "cat" ],
[ "bobo", "", "cat" ],
[ "c", "", "cat" ],
[ "car", "", "cat" ],
[ "cat", "", "doge" ],
[ "catering", "cat", "doge" ],
[ "d", "cat", "doge" ],
[ "doge", "cat", "wallace" ],
[ "dogerton", "doge", "wallace" ],
[ "w", "doge", "wallace" ],
[ "wallace", "doge", "" ],
[ "wallace123", "wallace", ""]
]
}
}
Loading

0 comments on commit dfe66ca

Please sign in to comment.