Commit Graph

513 Commits

Author SHA1 Message Date
debris
3e1add7051 flush macro 2016-01-15 19:51:48 +01:00
debris
e096d75448 Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2016-01-15 16:37:50 +01:00
arkpar
c224808416 Merge branch 'network' 2016-01-15 16:36:30 +01:00
arkpar
3ec294bda2 Missing files 2016-01-15 16:36:08 +01:00
debris
00a80da5bb Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2016-01-15 16:33:09 +01:00
Gav Wood
af65d539d1 Merge pull request #49 from gavofyork/network
Refactoring: General IO is now split from Networking IO
2016-01-15 16:25:21 +01:00
debris
6e67aea4bf Merge branch 'master' of https://github.com/gavofyork/ethcore-util 2016-01-15 16:20:55 +01:00
arkpar
2319fd4cec New list of bootnodes 2016-01-15 16:19:21 +01:00
Marek Kotewicz
e755f74d2e Merge pull request #54 from gavofyork/gav
Make clear when the panic occurs to a missing trie root.
2016-01-15 16:02:25 +01:00
Gav Wood
34b516b8b0 Move flush back to common. 2016-01-15 14:42:16 +01:00
Gav Wood
df151ab92c Make clear when the panic occurs to a missing trie root. 2016-01-15 14:40:51 +01:00
Gav Wood
73f849d7c9 Merge remote-tracking branch 'origin/master' into gav 2016-01-15 13:25:10 +01:00
Arkadiy Paronyan
ec4ea71335 Merge pull request #53 from gavofyork/gav
Add flush function.
2016-01-15 13:15:38 +01:00
debris
92619bcef8 Merge branch 'gav' of https://github.com/gavofyork/ethcore-util 2016-01-15 13:12:37 +01:00
Gav Wood
1136e65f0d Add flush function. 2016-01-15 13:11:30 +01:00
arkpar
223e946268 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-15 12:18:57 +01:00
Arkadiy Paronyan
844ae0908d Merge pull request #51 from gavofyork/gav
Fix for assumption that empty trie root RLP can always be looked up.
2016-01-15 11:24:56 +01:00
Gav Wood
23fbe39408 Fix for assumption that empty trie root RLP can always be looked up. 2016-01-15 04:02:24 +01:00
debris
9a3944d890 Merge branch 'mul_fix' of https://github.com/gavofyork/ethcore-util 2016-01-15 02:32:59 +01:00
Arkadiy Paronyan
905218af8d Merge pull request #50 from gavofyork/rocksdb_0.3
updated to rocksdb wrapper version 0.3
2016-01-15 02:19:28 +01:00
debris
838eea61f9 updated to rocksdb wrapper version 0.3 2016-01-15 01:57:14 +01:00
Tomusdrw
6252549bda Merge branch 'master' into mul_fix
Conflicts:
	src/uint.rs
2016-01-15 01:45:01 +01:00
Tomusdrw
9b78a89f96 Overflow semantics changed 2016-01-15 01:41:08 +01:00
arkpar
8dd4b3689a Removed unused import 2016-01-15 00:54:43 +01:00
arkpar
825f3733fd Removed debug output 2016-01-15 00:52:21 +01:00
arkpar
736a9f81a7 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-15 00:51:07 +01:00
arkpar
2d36062794 Slab bug workaround 2016-01-15 00:50:48 +01:00
Gav Wood
ab399badf6 Merge remote-tracking branch 'origin/master' into gav 2016-01-15 00:07:59 +01:00
Marek Kotewicz
1ebd14bb18 Merge pull request #48 from gavofyork/gav
from_existing works for an empty DB if passed empty RLP SHA3; Option types in JSON.
2016-01-14 23:44:40 +01:00
Gav Wood
6a7c823862 Option types in JSON, more tests. 2016-01-14 23:39:59 +01:00
Gav Wood
3006b8ac66 Merge remote-tracking branch 'origin/master' into gav 2016-01-14 23:15:35 +01:00
Gav Wood
b781fe6753 from_existing works for an empty DB if passed empty RLP SHA3. 2016-01-14 23:13:28 +01:00
arkpar
3b557cdc07 Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-14 22:38:00 +01:00
Arkadiy Paronyan
ca3413b500 Merge pull request #47 from gavofyork/gav
New JSON conversion traits.
2016-01-14 22:19:19 +01:00
Gav Wood
d2cc3b9b5b Remove unnecessary unwraps in json_aid. 2016-01-14 22:16:41 +01:00
Tomusdrw
b1e986cbdd Fixing multiplication in uints 2016-01-14 22:02:10 +01:00
Gav Wood
5e6632ca47 Remove cruft 2016-01-14 21:58:55 +01:00
Gav Wood
ccab2ea920 Missing files for previous commit. 2016-01-14 21:24:16 +01:00
Gav Wood
4f53db60ed New JSON conversion traits. 2016-01-14 21:24:03 +01:00
arkpar
df2e9854c7 Host info 2016-01-14 19:04:13 +01:00
arkpar
db25f7e590 Minor fixes 2016-01-14 16:56:59 +01:00
arkpar
d971abf1da Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-14 16:52:18 +01:00
arkpar
a2f13e1efb Minor fixes 2016-01-14 16:52:10 +01:00
Gav Wood
df1ff2a448 Merge remote-tracking branch 'origin/master' into gav 2016-01-14 16:47:14 +01:00
Tomusdrw
ca49c6b625 Merge branch 'master' of github.com:gavofyork/ethcore-util 2016-01-14 14:56:47 +01:00
Gav Wood
c1603b8286 Merge remote-tracking branch 'origin/master' into gav 2016-01-14 13:11:47 +01:00
Gav Wood
d63db8523c Fix test, revert fn hex() behaviour. 2016-01-14 13:10:18 +01:00
Gav Wood
1c89b9732d Nicer display output for hash types. 2016-01-14 12:27:41 +01:00
arkpar
2ceffb425c Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-14 02:18:32 +01:00
Gav Wood
787a119f12 Workaround. 2016-01-14 01:28:09 +01:00