Commits · 3b557cdc07ab12777edeb0a57c81668ab888be85 · parity / parity-test-sync

Jan 14, 2016
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · 3b557cdc
  Arkadiy Paronyan authored Jan 14, 2016
  
  3b557cdc
- Merge pull request #47 from gavofyork/gav · ca3413b5
  Arkadiy Paronyan authored Jan 14, 2016
```
New JSON conversion traits.
```
  ca3413b5
- Remove unnecessary unwraps in json_aid. · d2cc3b9b
  Gav Wood authored Jan 14, 2016
  
  d2cc3b9b
- Remove cruft · 5e6632ca
  Gav Wood authored Jan 14, 2016
  
  5e6632ca
- Missing files for previous commit. · ccab2ea9
  Gav Wood authored Jan 14, 2016
  
  ccab2ea9
- New JSON conversion traits. · 4f53db60
  Gav Wood authored Jan 14, 2016
  
  4f53db60
- Host info · df2e9854
  Arkadiy Paronyan authored Jan 14, 2016
  
  df2e9854
- Minor fixes · db25f7e5
  Arkadiy Paronyan authored Jan 14, 2016
  
  db25f7e5
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · d971abf1
  Arkadiy Paronyan authored Jan 14, 2016
  
  d971abf1
- Minor fixes · a2f13e1e
  Arkadiy Paronyan authored Jan 14, 2016
  
  a2f13e1e
- Merge remote-tracking branch 'origin/master' into gav · df1ff2a4
  Gav Wood authored Jan 14, 2016
  
  df1ff2a4
- Merge branch 'master' of github.com:gavofyork/ethcore-util · ca49c6b6
  Tomusdrw authored Jan 14, 2016
  
  ca49c6b6
- Merge remote-tracking branch 'origin/master' into gav · c1603b82
  Gav Wood authored Jan 14, 2016
  
  c1603b82
- Fix test, revert fn hex() behaviour. · d63db852
  Gav Wood authored Jan 14, 2016
  
  d63db852
- Nicer display output for hash types. · 1c89b973
  Gav Wood authored Jan 14, 2016
  
  1c89b973
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · 2ceffb42
  Arkadiy Paronyan authored Jan 14, 2016
  
  2ceffb42
- Workaround. · 787a119f
  Gav Wood authored Jan 14, 2016
  
  787a119f
- Broken casting. · 46810e96
  Gav Wood authored Jan 14, 2016
  
  46810e96
Jan 13, 2016
- Merge branch 'master' of github.com:gavofyork/ethcore-util · 1dae68cd
  Tomusdrw authored Jan 14, 2016
  
  1dae68cd
- Merge pull request #44 from gavofyork/gav · 8a789533
  Marek Kotewicz authored Jan 13, 2016
```
Nice macros.
```
  8a789533
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · e4ef044d
  Arkadiy Paronyan authored Jan 13, 2016
  
  e4ef044d
- Merge pull request #42 from gavofyork/json_aid_changes · 8be95e57
  Gav Wood authored Jan 13, 2016
```
json aid changes
```
  8be95e57
- u256_from_ hex -> str. · 5fd5c461
  Gav Wood authored Jan 13, 2016
  
  5fd5c461
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · f72f7d05
  Arkadiy Paronyan authored Jan 13, 2016
  
  f72f7d05
- Merge remote-tracking branch 'origin/master' into gav · 7e7d75ce
  Gav Wood authored Jan 13, 2016
  
  7e7d75ce
- Io channel · 4d243790
  Arkadiy Paronyan authored Jan 13, 2016
  
  4d243790
- Nice macros. · b23ec6ee
  Gav Wood authored Jan 13, 2016
  
  b23ec6ee
- update pr to use From::from · 90645e30
  Marek Kotewicz authored Jan 13, 2016
  
  90645e30
- Merge branch 'master' of https://github.com/gavofyork/ethcore-util into json_aid_changes · dfc1be8a
  Marek Kotewicz authored Jan 13, 2016
  
  dfc1be8a
- Merge pull request #43 from gavofyork/gav · dee52bdc
  Arkadiy Paronyan authored Jan 13, 2016
```
From::from(u64) for hashes.
```
  dee52bdc
- Additional test. · 3a1d829b
  Gav Wood authored Jan 13, 2016
  
  3a1d829b
- Tests and an additional From::from for hex string -> hash that defaults to 0s for bad strings. · 5cc5e778
  Gav Wood authored Jan 13, 2016
  
  5cc5e778
- Merge branch 'master' into gav · 9fa9ef46
  Gav Wood authored Jan 13, 2016
  
  9fa9ef46
- From::from(u64) for hashes. · dd99ebd8
  Gav Wood authored Jan 13, 2016
  
  dd99ebd8
- json aid changes · 6c44f29b
  Marek Kotewicz authored Jan 13, 2016
  
  6c44f29b
- Merge pull request #41 from gavofyork/bytes_ref · dca7c653
  Gav Wood authored Jan 13, 2016
```
bytes_ref
```
  dca7c653
- bytes_ref · df3e3edc
  Marek Kotewicz authored Jan 13, 2016
  
  df3e3edc
- Merge branch 'master' of github.com:gavofyork/ethcore-util into io · 76dc2d60
  Arkadiy Paronyan authored Jan 13, 2016
  
  76dc2d60
- Work around ICE · a5bb7b7f
  Arkadiy Paronyan authored Jan 13, 2016
  
  a5bb7b7f
- Fixed context lifetimes · 28c48269
  Arkadiy Paronyan authored Jan 13, 2016
  
  28c48269