Commit Graph

488 Commits

Author SHA1 Message Date
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
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
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
Gav Wood
46810e961c Broken casting. 2016-01-14 01:27:02 +01:00
Tomusdrw
1dae68cd05 Merge branch 'master' of github.com:gavofyork/ethcore-util 2016-01-14 00:01:39 +01:00
Marek Kotewicz
8a789533d2 Merge pull request #44 from gavofyork/gav
Nice macros.
2016-01-13 23:23:13 +01:00
arkpar
e4ef044d44 Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-13 23:20:12 +01:00
Gav Wood
8be95e57ec Merge pull request #42 from gavofyork/json_aid_changes
json aid changes
2016-01-13 23:20:00 +01:00
Gav Wood
5fd5c461b3 u256_from_ hex -> str. 2016-01-13 23:19:08 +01:00
arkpar
f72f7d05e9 Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-13 23:14:59 +01:00
Gav Wood
7e7d75ce47 Merge remote-tracking branch 'origin/master' into gav 2016-01-13 23:14:53 +01:00
arkpar
4d2437906e Io channel 2016-01-13 23:13:57 +01:00
Gav Wood
b23ec6ee69 Nice macros. 2016-01-13 23:06:44 +01:00
debris
90645e30a6 update pr to use From::from 2016-01-13 22:05:10 +01:00
debris
dfc1be8a6e Merge branch 'master' of https://github.com/gavofyork/ethcore-util into json_aid_changes 2016-01-13 21:53:48 +01:00
Arkadiy Paronyan
dee52bdc45 Merge pull request #43 from gavofyork/gav
From::from(u64) for hashes.
2016-01-13 19:06:04 +01:00
Gav Wood
3a1d829b1d Additional test. 2016-01-13 19:00:19 +01:00
Gav Wood
5cc5e7780c Tests and an additional From::from for hex string -> hash that defaults to 0s for bad strings. 2016-01-13 18:58:57 +01:00
Gav Wood
9fa9ef46db Merge branch 'master' into gav 2016-01-13 18:41:52 +01:00
Gav Wood
dd99ebd859 From::from(u64) for hashes. 2016-01-13 18:41:33 +01:00
debris
6c44f29b06 json aid changes 2016-01-13 17:42:57 +01:00
Gav Wood
dca7c65345 Merge pull request #41 from gavofyork/bytes_ref
bytes_ref
2016-01-13 15:38:52 +01:00
debris
df3e3edc8a bytes_ref 2016-01-13 15:14:24 +01:00
arkpar
76dc2d6074 Merge branch 'master' of github.com:gavofyork/ethcore-util into io 2016-01-13 15:09:56 +01:00
arkpar
a5bb7b7f92 Work around ICE 2016-01-13 15:08:36 +01:00
arkpar
28c482691a Fixed context lifetimes 2016-01-13 13:56:48 +01:00
Marek Kotewicz
4650961a5a Merge pull request #40 from gavofyork/gav
Fix RLP on consensus.
2016-01-13 13:20:33 +01:00
Tomusdrw
95d97fc75c Merge branch 'master' of github.com:gavofyork/ethcore-util 2016-01-13 12:24:19 +01:00