Skip to content

fixed build errrors introduced by SpecType changes #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SurfingNerd merged 1 commit into from
Mar 24, 2026
Merged

fixed build errrors introduced by SpecType changes #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/evmbin/src/info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion bin/evmbin/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
})
}

Expand Down
2 changes: 1 addition & 1 deletion bin/oe/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down
8 changes: 4 additions & 4 deletions bin/oe/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pub enum SpecType {
#[default]
Diamond,
DiamondTestnet,
Ethereum,
Foundation,
Poanet,
Xdai,
Volta,
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand All @@ -122,7 +122,7 @@ impl SpecType {
pub fn spec<'a, T: Into<SpecParams<'a>>>(&self, params: T) -> Result<Spec, String> {
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)),
Expand Down
2 changes: 1 addition & 1 deletion crates/ethcore/src/ethereum/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion crates/ethcore/src/json_tests/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion crates/ethcore/sync/src/chain/fork_filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading