This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
removed redundant state_root function from spec #10955
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
debris
added
A0-pleasereview 🤓
dvdplm
approved these changes
Aug 8, 2019
ordian
reviewed
Aug 8, 2019
| ethjson::spec::Spec::load(reader) | ||
| .map_err(fmt_err) | ||
| .and_then(|x| load_from(params.into(), x).map_err(fmt_err)) | ||
| .map_err(|e| Error::Msg(e.to_string())) |
There was a problem hiding this comment.
why remove Spec json is invalid prefix?
ordian
reviewed
Aug 8, 2019
| @@ -133,7 +133,7 @@ impl SpecType { | |||
| SpecType::Dev => Ok(spec::new_instant()), | |||
| SpecType::Custom(ref filename) => { | |||
| let file = fs::File::open(filename).map_err(|e| format!("Could not load specification file at {}: {}", filename, e))?; | |||
| Spec::load(params, file) | |||
| Spec::load(params, file).map_err(|e| e.to_string()) | |||
There was a problem hiding this comment.
nit: this could be map_err(ToString::to_string)
ordian
approved these changes
Aug 8, 2019
ordian
added
A8-looksgood 🦄
machine |
dvdplm
added a commit
that referenced
this pull request
Aug 13, 2019
ordian
added a commit
that referenced
this pull request
Aug 15, 2019
* master: [evmbin] fix compilation (#10976) Update to latest trie version. (#10972) [blooms-db] Fix benchmarks (#10974) Fix ethcore/benches build. (#10964) tx-pool: accept local tx with higher gas price when pool full (#10901) Disable unsyncable expanse chain (#10926) Extract Machine from ethcore (#10949) removed redundant state_root function from spec, improve spec error types (#10955) Add support for Energy Web Foundation's new chains (#10957) [evmbin] add more tests to main.rs (#10956) Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953) unify loading spec && further spec cleanups (#10948) refactor: Refactor evmbin CLI (#10742) journaldb changes (#10929) Allow default block parameter to be blockHash (#10932) Enable sealing when engine is ready (#10938) Fix some warnings and typos. (#10941) Updated security@parity.io key (#10939) Change the return type of step_inner function. (#10940)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
improve spec error types