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

update parity module

Browse Source
This commit is contained in:
keorn 2016-11-11 17:10:47 +00:00
parent beaa014543
commit 225d0b02e7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parity/params.rs
View File

@ -19,7 +19,6 @@ use std::time::Duration;
use util::{Address, U256, version_data}; use util::{Address, U256, version_data};
use util::journaldb::Algorithm; use util::journaldb::Algorithm;
use ethcore::spec::Spec; use ethcore::spec::Spec;
use ethcore::ethereum;
use ethcore::client::Mode; use ethcore::client::Mode;
use ethcore::miner::{GasPricer, GasPriceCalibratorOptions}; use ethcore::miner::{GasPricer, GasPriceCalibratorOptions};
use user_defaults::UserDefaults; use user_defaults::UserDefaults;
@ -59,11 +58,11 @@ impl str::FromStr for SpecType {
impl SpecType { impl SpecType {
pub fn spec(&self) -> Result<Spec, String> { pub fn spec(&self) -> Result<Spec, String> {
match *self { match *self {
SpecType::Mainnet => Ok(ethereum::new_frontier()), SpecType::Mainnet => Ok(Spec::new_ethereum_frontier()),
SpecType::Testnet => Ok(ethereum::new_morden()), SpecType::Testnet => Ok(Spec::new_ethereum_morden()),
SpecType::Olympic => Ok(ethereum::new_olympic()), SpecType::Olympic => Ok(Spec::new_ethereum_olympic()),
SpecType::Classic => Ok(ethereum::new_classic()), SpecType::Classic => Ok(Spec::new_ethereum_classic()),
SpecType::Expanse => Ok(ethereum::new_expanse()), SpecType::Expanse => Ok(Spec::new_expanse()),
SpecType::Custom(ref filename) => { SpecType::Custom(ref filename) => {
let file = try!(fs::File::open(filename).map_err(|_| "Could not load specification file.")); let file = try!(fs::File::open(filename).map_err(|_| "Could not load specification file."));
Spec::load(file) Spec::load(file)