Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

removed redundant state_root function from spec#10955

Merged
dvdplm merged 1 commit into
masterfrom
spec-changes
Aug 12, 2019
Merged

removed redundant state_root function from spec#10955
dvdplm merged 1 commit into
masterfrom
spec-changes

Conversation

@debris
Copy link
Copy Markdown
Collaborator

@debris debris commented Aug 8, 2019

improve spec error types

@debris debris added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). labels Aug 8, 2019
@debris debris requested review from dvdplm and ordian August 8, 2019 12:56
Copy link
Copy Markdown
Collaborator

@dvdplm dvdplm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is stopping us from moving spec outside ethcore now?

Comment thread ethcore/src/spec/spec.rs
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()))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove Spec json is invalid prefix?

Comment thread parity/params.rs
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())
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this could be map_err(ToString::to_string)

@ordian ordian added this to the 2.7 milestone Aug 8, 2019
@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 8, 2019
@debris
Copy link
Copy Markdown
Collaborator Author

debris commented Aug 9, 2019

What is stopping us from moving spec outside ethcore now?

machine

@dvdplm dvdplm merged commit 509fda7 into master Aug 12, 2019
@ordian ordian deleted the spec-changes branch August 12, 2019 14:29
dvdplm added a commit that referenced this pull request Aug 13, 2019
* master:
  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)
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.

Labels

A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-looksgood 🦄 Pull request is reviewed well.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants