From 0867e4fae96c0b0d234f1710119a129f8b0d96f7 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 13:29:59 +0100 Subject: Squashed 'tests/files/' changes from 6f75ca3..2bfb7db 2bfb7db update memory test 88f32fa Merge remote-tracking branch 'origin/PoC9' into PoC9 a1f73f9 update gas costs e16b5d3 Move over to key value rather than array of arrays since they're unordered and no duplicates. ac11bbc Merge branch 'PoC9' of github.com:/ethereum/tests into PoC9 93ae304 Move to non-repeated. fd9e406 Added test 2 git-subtree-dir: tests/files git-subtree-split: 2bfb7dbe09c62319b28a2c2873caf7e7e99bf32a --- TrieTests/hex_encoded_securetrie_test.json | 44 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'TrieTests/hex_encoded_securetrie_test.json') diff --git a/TrieTests/hex_encoded_securetrie_test.json b/TrieTests/hex_encoded_securetrie_test.json index a0424fb61..bafeb3585 100644 --- a/TrieTests/hex_encoded_securetrie_test.json +++ b/TrieTests/hex_encoded_securetrie_test.json @@ -1,28 +1,30 @@ { "test1": { - "in": [ - [ - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0xf848018405f446a7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" - ], - [ - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", - "0xf8440101a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a004bccc5d94f4d1f99aab44369a910179931772f2a5c001c3229f57831c102769" - ], - [ - "0xd2571607e241ecf590ed94b12d87c94babe36db6", - "0xf8440180a0ba4b47865c55a341a4a78759bb913cd15c3ee8eaf30a62fa8d1c8863113d84e8a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" - ], - [ - "0x62c01474f089b07dae603491675dc5b5748f7049", - "0xf8448080a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" - ], - [ - "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "in": { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": + "0xf848018405f446a7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87": + "0xf8440101a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a004bccc5d94f4d1f99aab44369a910179931772f2a5c001c3229f57831c102769", + "0xd2571607e241ecf590ed94b12d87c94babe36db6": + "0xf8440180a0ba4b47865c55a341a4a78759bb913cd15c3ee8eaf30a62fa8d1c8863113d84e8a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "0x62c01474f089b07dae603491675dc5b5748f7049": + "0xf8448080a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": "0xf8478083019a59a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" - ] - ], + }, "root": "0x730a444e08ab4b8dee147c9b232fc52d34a223d600031c1e9d25bfc985cbd797", "hexEncoded": true }, + "test2": { + "in": { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": + "0xf84c01880de0b6b3a7622746a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", + "0x095e7baea6a6c7c4c2dfeb977efac326af552d87": + "0xf84780830186b7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0501653f02840675b1aab0328c6634762af5d51764e78f9641cccd9b27b90db4f", + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": + "0xf8468082521aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" + }, + "root": "0xa7c787bf470808896308c215e22c7a580a0087bb6db6e8695fb4759537283a83", + "hexEncoded": true + } } -- cgit v1.2.3