Commit Graph

447 Commits

Author SHA1 Message Date
Gav Wood
8be95e57ec Merge pull request #42 from gavofyork/json_aid_changes
json aid changes
2016-01-13 23:20:00 +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
Marek Kotewicz
4650961a5a Merge pull request #40 from gavofyork/gav
Fix RLP on consensus.
2016-01-13 13:20:33 +01:00
Gav Wood
4be539a965 Stirct ordering for hashes. 2016-01-13 12:16:10 +01:00
Gav Wood
6447f9b90b Additional helper function. 2016-01-13 01:18:33 +01:00
Gav Wood
635bf284b4 Fix RLP on consensus.
Add JSON helpers.
2016-01-12 23:44:30 +01:00
Arkadiy Paronyan
870dff90d4 Merge pull request #39 from gavofyork/gav
Add U512 type and a few conversions.
2016-01-12 17:43:03 +01:00
Gav Wood
6b1eb943e2 Add U512 type and a few conversions. 2016-01-12 17:40:55 +01:00
Arkadiy Paronyan
eab9f010f9 Merge pull request #38 from gavofyork/gav
Fix panic in crypto, avoid incorrect casting in bytes.
2016-01-12 00:58:04 +01:00
Gav Wood
e2de777c30 Fix panic in crypto, avoid incorrect casting in bytes. 2016-01-12 00:55:42 +01:00
Marek Kotewicz
584bcda7d5 Merge pull request #37 from gavofyork/gav
Avoid panicking on oversize u64.
2016-01-12 00:16:11 +01:00
Gav Wood
48fbf24e21 Avoid panicking on oversize u64. 2016-01-12 00:10:47 +01:00
Marek Kotewicz
b6b65ea182 Merge pull request #36 from gavofyork/gav
Avoid panic on invalid uint data.
2016-01-12 00:01:32 +01:00
Gav Wood
65ab524053 Avoid panic on invalid uint data. 2016-01-11 23:59:33 +01:00
Gav Wood
d661116580 Merge branch 'master' into gav 2016-01-11 19:13:06 +01:00
Marek Kotewicz
e4dbba874f Merge pull request #35 from gavofyork/gav
Additional mem use.
2016-01-11 18:02:58 +01:00
Gav Wood
1c48e34d69 Additional mem use. 2016-01-11 18:01:54 +01:00
Marek Kotewicz
a233320f88 Merge pull request #34 from gavofyork/gav
Couple more standard things in common.
2016-01-11 17:40:34 +01:00
Gav Wood
c104009ef6 Additional standard.rs. 2016-01-11 17:38:28 +01:00
Gav Wood
a197f3f60e Merge remote-tracking branch 'origin/master' into gav 2016-01-11 13:02:03 +01:00
arkpar
54fb66bb7d Merge branch 'network' 2016-01-11 11:52:56 +01:00
arkpar
c269cb5c85 Added sync to std uses 2016-01-11 11:52:18 +01:00
Gav Wood
e116bd3d20 Merge pull request #33 from gavofyork/network
Padding decryption, connection registration fixed
2016-01-10 23:58:53 +01:00
arkpar
6f3c3fa020 Documentation 2016-01-10 22:42:27 +01:00
arkpar
02b530f4aa Style 2016-01-10 15:13:12 +01:00
arkpar
39fb29ffcc Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-10 14:10:29 +01:00
Arkadiy Paronyan
4ed6a0054b Merge pull request #32 from gavofyork/gav
Remove unneeded error.
2016-01-10 14:10:07 +01:00
arkpar
2f45d22b38 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-10 14:09:51 +01:00
Gav Wood
dfd31f96e1 Merge branch 'master' into gav 2016-01-10 14:06:53 +01:00
Gav Wood
6410759bc3 Remove unneeded error. 2016-01-10 14:06:38 +01:00
arkpar
b0cef968e7 Networking fixes 2016-01-10 14:02:01 +01:00
Arkadiy Paronyan
8254b4283b Merge pull request #31 from gavofyork/gav
Bloom stuff and RlpStandard
2016-01-10 13:23:04 +01:00
Gav Wood
3277b23b9e Merge branch 'master' into gav 2016-01-10 12:55:04 +01:00
Gav Wood
5862d58379 Reworked network errors (now NetworkError) to be a subset of UtilErrors rather than the
other way around.
2016-01-10 12:53:55 +01:00
Gav Wood
ffc28bf495 Additional bloom-related functionality.
RlpStandard for non-emit_*-based RlpStream extesions.
2016-01-09 23:47:46 +01:00
Marek Kotewicz
c649c134b7 Merge pull request #30 from gavofyork/gav
Refactoring, BitOrAssign for hash, minor additions.
2016-01-09 23:02:30 +01:00
Gav Wood
568d28e94b Bitwise Or Assign and some additional convenience in Hash. 2016-01-09 22:30:13 +01:00
Gav Wood
88810a5762 Merge branch 'master' into gav 2016-01-09 14:20:49 +01:00
Arkadiy Paronyan
ebe554d226 Merge pull request #29 from gavofyork/gav
Introduce use-dependency amalgamation.
2016-01-09 13:04:44 +01:00
Gav Wood
6eac110b65 Merge branch 'master' into gav 2016-01-09 12:33:40 +01:00
Gav Wood
2b90f7d03a Introduce use-dependency amalgamation. We now have:
- `use standard;` (bring in a set of standard and external dependencies)
- `use common;` (bring in a low-level subset of this crate; basically anything that itself requires only `use standard;`)

And, from an external create:
- `use ethcore_util::*;` (bring in the entirety of this module and the standard dependencies)
2016-01-09 12:12:36 +01:00