diff --git a/bin/evmbin/src/info.rs b/bin/evmbin/src/info.rs index 4aa3a836a..e2133ef23 100644 --- a/bin/evmbin/src/info.rs +++ b/bin/evmbin/src/info.rs @@ -279,7 +279,7 @@ pub mod tests { params.gas = gas.into(); let tempdir = TempDir::new("").unwrap(); - let spec = ::ethcore::ethereum::new_foundation(&tempdir.path()); + let spec = ::ethcore::ethereum::new_ethereum(&tempdir.path()); let result = run_action(&spec, params, informant, TrieSpec::Secure); match result { Ok(Success { traces, .. }) => compare(traces, expected), diff --git a/bin/evmbin/src/main.rs b/bin/evmbin/src/main.rs index a4e0db760..f41f00663 100644 --- a/bin/evmbin/src/main.rs +++ b/bin/evmbin/src/main.rs @@ -412,7 +412,7 @@ impl Args { spec::Spec::load(&::std::env::temp_dir(), file)? } } - None => ethcore::ethereum::new_foundation(&::std::env::temp_dir()), + None => ethcore::ethereum::new_ethereum(&::std::env::temp_dir()), }) } diff --git a/bin/oe/configuration.rs b/bin/oe/configuration.rs index 2926783a6..8110076a2 100644 --- a/bin/oe/configuration.rs +++ b/bin/oe/configuration.rs @@ -689,7 +689,7 @@ impl Configuration { if let Some(dec) = self.args.arg_min_gas_price { return Ok(GasPricerConfig::Fixed(U256::from(dec))); - } else if self.chain()? != SpecType::Ethereum { + } else if self.chain()? != SpecType::Foundation { return Ok(GasPricerConfig::Fixed(U256::zero())); } diff --git a/bin/oe/params.rs b/bin/oe/params.rs index 17b17fa93..00796ea0e 100644 --- a/bin/oe/params.rs +++ b/bin/oe/params.rs @@ -41,7 +41,7 @@ pub enum SpecType { #[default] Diamond, DiamondTestnet, - Ethereum, + Foundation, Poanet, Xdai, Volta, @@ -68,7 +68,7 @@ impl str::FromStr for SpecType { let spec = match s { "diamond" | "dmd" => SpecType::Diamond, "diamond-testnet" | "dmd-testnet" => SpecType::DiamondTestnet, - "eth" | "ethereum" | "foundation" | "mainnet" => SpecType::Ethereum, + "eth" | "ethereum" | "foundation" | "mainnet" => SpecType::Foundation, "poanet" | "poacore" => SpecType::Poanet, "xdai" => SpecType::Xdai, "volta" => SpecType::Volta, @@ -96,7 +96,7 @@ impl fmt::Display for SpecType { f.write_str(match *self { SpecType::Diamond => "diamond", SpecType::DiamondTestnet => "diamond-testnet", - SpecType::Ethereum => "ethereum", + SpecType::Foundation => "ethereum", SpecType::Poanet => "poanet", SpecType::Xdai => "xdai", SpecType::Volta => "volta", @@ -122,7 +122,7 @@ impl SpecType { pub fn spec<'a, T: Into>>(&self, params: T) -> Result { let params = params.into(); match *self { - SpecType::Ethereum => Ok(ethereum::new_ethereum(params)), + SpecType::Foundation => Ok(ethereum::new_ethereum(params)), SpecType::Diamond => Ok(ethereum::new_diamond(params)), SpecType::DiamondTestnet => Ok(ethereum::new_diamond_testnet(params)), SpecType::Poanet => Ok(ethereum::new_poanet(params)), diff --git a/crates/ethcore/src/ethereum/mod.rs b/crates/ethcore/src/ethereum/mod.rs index c46b4f0e6..b8c2d9c93 100644 --- a/crates/ethcore/src/ethereum/mod.rs +++ b/crates/ethcore/src/ethereum/mod.rs @@ -461,7 +461,7 @@ mod tests { #[test] fn frontier() { - let frontier = new_foundation(&::std::env::temp_dir()); + let frontier = new_ethereum(&::std::env::temp_dir()); assert_eq!( frontier.state_root(), diff --git a/crates/ethcore/src/json_tests/runner.rs b/crates/ethcore/src/json_tests/runner.rs index 1def4f91c..38c740304 100644 --- a/crates/ethcore/src/json_tests/runner.rs +++ b/crates/ethcore/src/json_tests/runner.rs @@ -198,7 +198,7 @@ impl TestRunner { |test: &DifficultyTests, path: &Path, json: &[u8]| { let spec = match &test.chainspec { TestChainSpec::Foundation => { - crate::ethereum::new_foundation(&tempdir().unwrap().path()) + crate::ethereum::new_ethereum(&tempdir().unwrap().path()) } TestChainSpec::ByzantiumTest => crate::ethereum::new_byzantium_test(), TestChainSpec::FrontierTest => crate::ethereum::new_frontier_test(), diff --git a/crates/ethcore/sync/src/chain/fork_filter.rs b/crates/ethcore/sync/src/chain/fork_filter.rs index 4f5de69f6..3b0c02846 100644 --- a/crates/ethcore/sync/src/chain/fork_filter.rs +++ b/crates/ethcore/sync/src/chain/fork_filter.rs @@ -83,7 +83,7 @@ mod tests { #[test] fn ethereum_spec() { test_spec( - || ethereum::new_foundation(&String::new()), + || ethereum::new_ethereum(&String::new()), vec![ 1_150_000, 1_920_000, 2_463_000, 2_675_000, 4_370_000, 7_280_000, 9_069_000, 9_200_000, 12_244_000, 12_965_000, 13_773_000,