aboutsummaryrefslogtreecommitdiffstats
path: root/blockchain.cpp
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-04-11 06:45:21 +0800
committerGav Wood <i@gavwood.com>2015-04-11 06:45:21 +0800
commitb848fa9af1487c3cfcc35d4ff24a6c48b0c79d06 (patch)
tree4fb8760fe2e2aa182a12391d2e29d5b2db108907 /blockchain.cpp
parentc111dbff3f4d4d5e6d064b38bcd645f2d763ccab (diff)
downloaddexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar.gz
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar.bz2
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar.lz
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar.xz
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.tar.zst
dexon-solidity-b848fa9af1487c3cfcc35d4ff24a6c48b0c79d06.zip
Ability to switch GPU/CPU mining on the fly.
Diffstat (limited to 'blockchain.cpp')
-rw-r--r--blockchain.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/blockchain.cpp b/blockchain.cpp
index ab01df5a..15cda803 100644
--- a/blockchain.cpp
+++ b/blockchain.cpp
@@ -192,7 +192,8 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
state.sync(bc, txs, gp);
state.commitToMine(bc);
MineInfo info;
- for (info.completed = false; !info.completed; info = state.mine()) {}
+ ProofOfWork pow;
+ for (info.completed = false; !info.completed; info = state.mine(&pow)) {}
state.completeMine();
}
catch (Exception const& _e)
@@ -577,7 +578,7 @@ void overwriteBlockHeader(BlockInfo& _currentBlockHeader, mObject& _blObj)
std::pair<MineInfo, Ethash::Proof> ret;
while (!ProofOfWork::verify(_currentBlockHeader))
{
- ret = pow.mine(_currentBlockHeader, 1000, true, true);
+ ret = pow.mine(_currentBlockHeader, 1000, true);
Ethash::assignResult(ret.second, _currentBlockHeader);
}
}
@@ -623,7 +624,7 @@ void updatePoW(BlockInfo& _bi)
std::pair<MineInfo, Ethash::Proof> ret;
while (!ProofOfWork::verify(_bi))
{
- ret = pow.mine(_bi, 10000, true, true);
+ ret = pow.mine(_bi, 10000, true);
Ethash::assignResult(ret.second, _bi);
}
_bi.noteDirty();