Merge remote-tracking branch 'upstream/new-jsonrpc' into pip-msg

This commit is contained in:
Robert Habermeier
2017-03-21 21:15:06 +01:00
48 changed files with 829 additions and 659 deletions

View File

@@ -326,7 +326,7 @@ impl Spec {
pub fn load<R>(reader: R) -> Result<Self, String> where R: Read {
match ethjson::spec::Spec::load(reader) {
Ok(spec) => Ok(spec.into()),
_ => Err("Spec json is invalid".into()),
Err(e) => Err(format!("Spec json is invalid: {}", e)),
}
}