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

Fixed build aftre botched merge

Browse Source
This commit is contained in:
arkpar 2016-01-17 12:11:39 +01:00
parent efccde7b66
commit 6502399e6b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ethereum/ethash.rs
View File

@ -12,29 +12,21 @@ use evm::Factory;
/// mainnet chains in the Olympic, Frontier and Homestead eras. /// mainnet chains in the Olympic, Frontier and Homestead eras.
pub struct Ethash { pub struct Ethash {
spec: Spec, spec: Spec,
<<<<<<< HEAD
pow: EthashManager, pow: EthashManager,
=======
factory: Factory, factory: Factory,
u64_params: RwLock<HashMap<String, u64>>, u64_params: RwLock<HashMap<String, u64>>,
u256_params: RwLock<HashMap<String, U256>>, u256_params: RwLock<HashMap<String, U256>>,
>>>>>>> a350aae82b00d2bee0e6be8017d38b644121d3e9
} }
impl Ethash { impl Ethash {
pub fn new_boxed(spec: Spec) -> Box<Engine> { pub fn new_boxed(spec: Spec) -> Box<Engine> {
<<<<<<< HEAD
Box::new(Ethash { Box::new(Ethash {
spec: spec, spec: spec,
pow: EthashManager::new(), pow: EthashManager::new(),
=======
Box::new(Ethash{
spec: spec,
// TODO [todr] should this return any specific factory? // TODO [todr] should this return any specific factory?
factory: Factory::default(), factory: Factory::default(),
u64_params: RwLock::new(HashMap::new()), u64_params: RwLock::new(HashMap::new()),
u256_params: RwLock::new(HashMap::new()) u256_params: RwLock::new(HashMap::new())
>>>>>>> a350aae82b00d2bee0e6be8017d38b644121d3e9
}) })
} }