grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use TryFrom instead of From+panic for Builtin (#11140)

Browse Source 
* Use TryFrom instead of From+panic for Builtin

* fix tests

* change expect text to be more descriptive

* fix formatting
This commit is contained in:
Andy Weiss
2019-10-09 05:42:03 -07:00
committed by David
parent 11c447dfbe
commit a404dd5415
5 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/machine/src/test_helpers.rs
View File

@@ -16,14 +16,16 @@
//! Provide facilities to create `Machine` instances for testing various networks.
use std::convert::TryFrom;
use common_types::engines::params::CommonParams;
use ethcore_builtin::Builtin;
use ethjson;
use crate::Machine;
pub fn load_machine(reader: &[u8]) -> Machine {
let spec = ethjson::spec::Spec::load(reader).expect("chain spec is invalid");
let builtins = spec.accounts.builtins().into_iter().map(|p| (p.0.into(), From::from(p.1))).collect();
let builtins = spec.accounts.builtins().into_iter().map(|p| (p.0.into(), Builtin::try_from(p.1).expect("chain spec is invalid"))).collect();
let params = CommonParams::from(spec.params);
if let ethjson::spec::Engine::Ethash(ref ethash) = spec.engine {