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

evmbin: Fix gas_used issue in state root mismatch and handle output better #9418

Merged
merged 4 commits into from
Aug 29, 2018

Conversation

sorpaas
Copy link
Collaborator

@sorpaas sorpaas commented Aug 27, 2018

Fixes #9408

  • When state root mismatch, prints the actual gas used instead of total gas.
  • Output full hash of state root hashes in error message.
  • Change std_json informant to have two sinks, one for traces (which default to stderr), and another for test results (which defaults to stdout).

@sorpaas sorpaas added A0-pleasereview 🤓 Pull request needs code review. M5-binaries 📦 External binaries (ethkey, ethstore, ethvm, etc.) labels Aug 27, 2018
@sorpaas sorpaas added this to the 2.1 milestone Aug 27, 2018
}

/// JSON formatting informant.
pub struct Informant<T: Writer = io::Stdout> {
pub struct Informant<Trace: Writer = io::Stderr, Out: Writer = io::Stdout> {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we remove trait bound from the struct? (see #9055)

Informant {
code: Default::default(),
instruction: Default::default(),
depth: Default::default(),
stack: Default::default(),
storage: Default::default(),
sink,
trace_sink, out_sink

This comment was marked as resolved.

This comment was marked as outdated.

@ordian ordian added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Aug 29, 2018
Copy link
Contributor

@andresilva andresilva left a comment

Choose a reason for hiding this comment

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

LGTM

@ordian ordian merged commit 8a5c9a8 into master Aug 29, 2018
@ordian ordian deleted the sp-state-test branch August 29, 2018 17:13
dvdplm added a commit that referenced this pull request Aug 30, 2018
* master:
  evmbin: Fix gas_used issue in state root mismatch and handle output better (#9418)
  Update hardcoded sync (#9421)
  Add block reward contract config to ethash and allow off-chain contracts (#9312)
  Private packets verification and queue refactoring (#8715)
  Update tobalaba.json (#9419)
  docs: add parity ethereum logo to readme (#9415)
  build: update rocksdb crate (#9414)
  Updating the CI system  (#8765)
  Better support for eth_getLogs in light mode (#9186)
  Add update docs script to CI (#9219)
  `gasleft` extern implemented for WASM runtime (kip-6) (#9357)
  block view! removal in progress (#9397)
  Prevent sync restart if import queue full (#9381)
  nonroot CentOS Docker image (#9280)
  ethcore: kovan: delay activation of strict score validation (#9406)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M5-binaries 📦 External binaries (ethkey, ethstore, ethvm, etc.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants