Commit Graph

339 Commits

Author SHA1 Message Date
arkpar
34acc420f2 Merge branch 'master' of github.com:gavofyork/ethcore-util into network
Conflicts:
	src/triehash.rs
2015-12-03 15:15:17 +01:00
arkpar
2e3750323a Bugfixes; Move discovery draft to a module 2015-12-03 15:11:40 +01:00
Gav Wood
bb9163ac58 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-03 14:56:57 +01:00
Gav Wood
cbbe5ee0fe trie node ref counter. good for testing. 2015-12-03 14:56:39 +01:00
debris
b2376dfc7b removed duplicate tests 2015-12-03 13:11:02 +01:00
debris
611226c117 small changes in tests 2015-12-03 11:36:20 +01:00
debris
84eb30a133 empty lists tests 2015-12-03 06:06:42 +01:00
debris
05f7e85d30 rlp tests, the beginning 2015-12-03 05:44:35 +01:00
Gav Wood
84cc7715b4 Fix trie - tests pass. 2015-12-03 00:50:14 +01:00
Gav Wood
c39fa7f973 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-03 00:33:16 +01:00
Gav Wood
b99cefb9d6 Fix for node removal from trie. 2015-12-03 00:32:58 +01:00
debris
8b8a2e39e2 trie test failing 2015-12-03 00:29:31 +01:00
Gav Wood
3143e614a8 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-02 23:50:35 +01:00
Gav Wood
f20665c41a Fix test. 2015-12-02 23:50:14 +01:00
debris
46d841f81f removed redundant lifetime 2015-12-02 23:35:34 +01:00
debris
fe4141237e Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2015-12-02 23:13:45 +01:00
Gav Wood
8c9340d3cf Remove unused uses. 2015-12-02 23:01:32 +01:00
Gav Wood
1b41b96dd1 Clear up warnings. 2015-12-02 23:00:36 +01:00
Gav Wood
8b481d5e11 Remove. Untested. 2015-12-02 22:59:00 +01:00
debris
166b84d489 removed duplicate tests 2015-12-02 22:56:38 +01:00
debris
b9181b42bc *.json test files 2015-12-02 22:49:47 +01:00
debris
2cbbc872ff json-tests init 2015-12-02 21:50:33 +01:00
arkpar
6f2839086a Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2015-12-02 20:12:42 +01:00
arkpar
75b1de0482 Session 2015-12-02 20:11:13 +01:00
debris
9c85e4d305 commented out tests 2015-12-02 17:52:06 +01:00
Gav Wood
729968ebeb Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-02 15:05:21 +01:00
Gav Wood
c184758972 Reduce time needed for stress test. 2015-12-02 15:04:34 +01:00
debris
9650494311 remove redundant prints 2015-12-02 15:03:47 +01:00
Gav Wood
65d49f280c Trie fix. 2015-12-02 15:03:20 +01:00
debris
b8c1447c04 removed fmt::Debug from append 2015-12-02 14:29:09 +01:00
debris
aa02a71d09 removed DecoderError::BadRlp 2015-12-02 14:20:41 +01:00
debris
356be1c635 rlp payload_info method 2015-12-02 14:14:12 +01:00
debris
35ae32a8a5 payload_info moved to decoder 2015-12-02 14:05:17 +01:00
debris
21f87cfb0f ItemInfo -> PayloadInfo 2015-12-02 13:58:29 +01:00
debris
18a6090ce5 fixed trie_hash panic when he was processing duplicates 2015-12-02 12:57:25 +01:00
arkpar
10a43c1fed Encrypted connection 2015-12-02 12:07:46 +01:00
Gav Wood
706428acbe Random tests. 2015-12-02 02:44:45 +01:00
Gav Wood
fbab7f3cf3 Random trie tests. 2015-12-02 02:37:26 +01:00
Gav Wood
5468210cfd Fix bad test. 2015-12-02 00:43:09 +01:00
debris
60dc3decaa Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2015-12-02 00:22:47 +01:00
debris
73be98fb24 additional tests for insert 2015-12-02 00:21:03 +01:00
Gav Wood
88655203b5 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-02 00:19:58 +01:00
Gav Wood
21730b49e6 Fix up trie pretty print. 2015-12-02 00:14:14 +01:00
debris
beaf9117d4 lifetime of tria.at 2015-12-01 23:32:23 +01:00
Gav Wood
3fedfb7682 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 23:19:01 +01:00
Gav Wood
6ba9af18e9 Fiddling with tests. 2015-12-01 23:15:23 +01:00
debris
0cec68b59e fixed trie get and trie print 2015-12-01 23:14:38 +01:00
Gav Wood
c1c3152094 Avoid crying if we can't initialise the logger. 2015-12-01 22:44:18 +01:00
Gav Wood
9a5be1eee4 Known good. 2015-12-01 22:38:34 +01:00
Gav Wood
67b737c1f8 Fix one trie bug. 2015-12-01 22:22:52 +01:00
Gav Wood
4be633ad94 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 20:35:47 +01:00
Gav Wood
0d90b2c1f8 Minor fixes to trie printing. 2015-12-01 20:35:34 +01:00
debris
630ab57041 Merge branch 'master' of https://github.com/gavofyork/ethcore-util into at 2015-12-01 20:35:13 +01:00
debris
ec09deefb7 printing value of branch 2015-12-01 20:34:49 +01:00
Gav Wood
ba270ddb6b Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 20:25:06 +01:00
Gav Wood
68065b1875 Insertion trie fix. 2015-12-01 20:24:47 +01:00
debris
6c1c619247 extension print 2015-12-01 20:24:33 +01:00
Gav Wood
18de819344 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 19:45:48 +01:00
Gav Wood
8073adff68 Fix for adding item beyond a leaf. 2015-12-01 19:45:30 +01:00
debris
4a71c1266a removed build warnings 2015-12-01 19:24:14 +01:00
debris
665dfd622e // 2015-12-01 19:20:48 +01:00
debris
449e468778 Merge branch 'master' of https://github.com/gavofyork/ethcore-util into at 2015-12-01 19:19:43 +01:00
debris
b8b8e4c61a printing trie 2015-12-01 19:19:16 +01:00
Gav Wood
afbff3689c Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 19:10:03 +01:00
Gav Wood
d2d2f2a8fc Fix one bug. 2015-12-01 19:09:48 +01:00
debris
4f5399c558 improved printing 2015-12-01 18:43:44 +01:00
debris
8a2082d217 Merge branch 'master' of https://github.com/gavofyork/ethcore-util into at 2015-12-01 18:26:07 +01:00
debris
ea03811a6e print trie 2015-12-01 18:25:47 +01:00
Gav Wood
7f6efa9a8f pretty (hex) printing. 2015-12-01 18:25:18 +01:00
Gav Wood
fa80d376d3 Fix nibbleslice
Merge branch 'master' of github.com:gavofyork/ethcore-util
2015-12-01 17:48:13 +01:00
Gav Wood
3f5bd90b2b Easier debugging output for nibbleslice. 2015-12-01 17:43:24 +01:00
debris
37c394c99a failing insertion test 2015-12-01 17:03:54 +01:00
debris
3e497f46c0 Merge branch 'master' of https://github.com/gavofyork/ethcore-util into at 2015-12-01 16:42:16 +01:00
debris
83895ca109 trie.at() impl 2015-12-01 16:39:44 +01:00
Gav Wood
9041f81cba Additional trie test and fix. 2015-12-01 12:57:08 +01:00
Gav Wood
6c21bc7b95 out of order test for trieroot 2015-12-01 12:26:20 +01:00
Gav Wood
a90ef806a3 Broken triehash 2015-12-01 12:24:58 +01:00
Gav Wood
0179cf54b7 Better logging, additional tests. 2015-12-01 12:10:36 +01:00
arkpar
54a93d58a8 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2015-12-01 11:01:15 +01:00
Gav Wood
4e4b754eca First few tests working. 2015-12-01 03:35:55 +01:00
Gav Wood
87e458efed Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 02:25:31 +01:00
Gav Wood
d6e5bbae78 Trie compiles. 2015-12-01 02:23:53 +01:00
debris
24f9771716 fixed take_node lifetimes 2015-12-01 02:04:52 +01:00
Gav Wood
cceae8ecc2 less commented out code in trie. 2015-12-01 01:52:20 +01:00
Gav Wood
e8ca520dad Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 01:44:29 +01:00
Gav Wood
26f29b2fcd Logging. 2015-12-01 01:44:18 +01:00
debris
1934cb3bdd updated tiny_keccak library 2015-12-01 01:35:32 +01:00
Gav Wood
eb8f04a3e6 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-12-01 01:32:10 +01:00
Gav Wood
2b09521b56 Main logic for insertion into trie. 2015-12-01 01:12:06 +01:00
arkpar
a5b958a1a1 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2015-11-30 19:43:40 +01:00
debris
9019610728 NibbleSlice mid do not share lifetime with a parent view, but with a collection 2015-11-30 19:14:46 +01:00
debris
84b872819e rlp lifetimes 2015-11-30 17:23:52 +01:00
arkpar
2681f6290f Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2015-11-30 16:39:20 +01:00
arkpar
4873c33fef Encryption primitives; Continue work on handshake 2015-11-30 16:38:55 +01:00
debris
b51b81995e Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2015-11-30 16:14:21 +01:00
debris
6660b3d65f replaced usages of append(&"") to append_empty_data() 2015-11-30 16:14:03 +01:00
Gav Wood
0eb6f97a97 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 16:08:38 +01:00
Gav Wood
d293bce22d Trie progress... 2015-11-30 16:06:29 +01:00
debris
43326356d0 updated trie tests 2015-11-30 16:01:47 +01:00
debris
8e1af0e7ca Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2015-11-30 15:56:50 +01:00
debris
4a912870d1 docs for triehash 2015-11-30 15:56:41 +01:00
debris
ec7ce060e4 triehash cleanup in progress 2015-11-30 15:35:10 +01:00
Gav Wood
ddd0baa70a data_at in RLP. 2015-11-30 15:01:43 +01:00
Gav Wood
972b78d47b First insert in trie works! 2015-11-30 14:53:22 +01:00
Gav Wood
7fd6252772 Fix warnings, use Prototype. 2015-11-30 13:25:37 +01:00
Gav Wood
2d556d6f06 Add prototype. 2015-11-30 13:19:55 +01:00
Gav Wood
526f4b3a20 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 13:09:40 +01:00
debris
be1d208c36 rlp size function 2015-11-30 13:06:51 +01:00
Gav Wood
771756b3f4 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 12:58:55 +01:00
debris
0a93c7c32e Rlp.items -> Rlp.item_count, RlpStream.append_null -> RlpStream.append_empty_data 2015-11-30 12:58:23 +01:00
Gav Wood
d45bf38c2d Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 12:52:53 +01:00
debris
b6dc3e464d rlp items functions 2015-11-30 12:41:11 +01:00
debris
80f1e527dc Rlp is_int 2015-11-30 12:28:49 +01:00
debris
f444729569 Rlp is_null && is_empty methods 2015-11-30 12:06:08 +01:00
debris
93f2bd9314 Rlp data function 2015-11-30 11:54:09 +01:00
debris
f42e8c0665 RlpStream clear 2015-11-30 11:42:54 +01:00
Gav Wood
c8432ed3a8 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 11:33:59 +01:00
debris
fac89f784b updated todo 2015-11-30 11:33:31 +01:00
debris
bd6289756b fixed rlp decoder error names 2015-11-30 11:33:08 +01:00
debris
6ee5e1684b rename try_to_finish -> note_appended 2015-11-30 11:29:30 +01:00
debris
94a5216513 removed dangling ; 2015-11-30 11:25:09 +01:00
debris
2d7ae3a18a RlpStream out returns value instead of Result 2015-11-30 11:24:03 +01:00
debris
78965b3c5a RlpStream append_null 2015-11-30 11:16:50 +01:00
Gav Wood
7abac7fba8 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-30 02:57:22 +01:00
Gav Wood
c91bc6b419 Bug fix in nibble slice.
Trie.
2015-11-30 02:57:02 +01:00
debris
122144c00a docs for rlp 2015-11-30 02:55:03 +01:00
debris
448577d99c is_value -> is_data 2015-11-30 01:30:35 +01:00
debris
710d3594a8 triehash clenaup in progress 2015-11-30 01:19:04 +01:00
debris
f02bd0cd17 Merge branch 'master' of https://github.com/gavofyork/ethcore-util into rlp_fixes 2015-11-30 00:28:14 +01:00
debris
0c9ef317b2 fixed encoding of bytes in rlp, fixed encoding of long lists, triehash + basic tests... more tests todo 2015-11-30 00:28:03 +01:00
Gav Wood
c79a2fc4ea Examples and docs. 2015-11-29 21:35:21 +01:00
Gav Wood
930865fefb NibbleSlice struct. 2015-11-29 21:17:07 +01:00
Gav Wood
f1315cff71 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-29 20:11:12 +01:00
Gav Wood
06bbefd07b Nibbleslice basic operations. 2015-11-29 20:11:02 +01:00
debris
d23b8d9a74 Merge branch 'master' into rlp_fixes 2015-11-29 19:42:04 +01:00
debris
f4292134c0 uncommented triehash 2015-11-29 19:42:03 +01:00
debris
03c1944d9c fixed encoding of byte vectors 2015-11-29 19:35:22 +01:00
Gav Wood
962fa4d812 Merge branch 'master' of github.com:gavofyork/ethcore-util 2015-11-29 18:45:53 +01:00
Gav Wood
9c632d58f2 Possible fix? 2015-11-29 18:45:41 +01:00
debris
a1c017b7ff Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2015-11-29 18:44:51 +01:00
debris
f7ec667852 in pro... 2015-11-29 18:44:29 +01:00
Gav Wood
cf62f67b5f Fix warnings. 2015-11-29 16:00:23 +01:00
Gav Wood
b334a8f824 Return lookup by reference. 2015-11-29 15:50:33 +01:00
debris
7e58f12712 triehash in progress 2015-11-29 15:41:29 +01:00
debris
1f6ae56468 as_nibbles 2015-11-29 12:39:37 +01:00
debris
96e1580ddf triehash, hex_prefix_encode 2015-11-29 12:22:35 +01:00
arkpar
5c975d06cc Started networking code 2015-11-29 11:50:28 +01:00
debris
d43091bf1e Merge branch 'crypto' of https://github.com/gavofyork/ethcore-util 2015-11-29 09:45:05 +01:00
debris
73566f071d updated rlp docs 2015-11-29 09:37:07 +01:00
debris
6f217e730c Rlp && UntrustedRlp changes 2015-11-29 09:28:48 +01:00