Browse Source

Merge remote-tracking branch 'upstream/develop' into PoWTests

cl-refactor
CJentzsch 10 years ago
parent
commit
271b6a6771
  1. 1
      ethminer/MinerAux.h
  2. 2
      libethereum/BlockChain.cpp

1
ethminer/MinerAux.h

@ -410,7 +410,6 @@ private:
} }
catch (...) catch (...)
{ {
cout << "Error phoning home. ET is sad." << endl;
} }
} }
#endif #endif

2
libethereum/BlockChain.cpp

@ -1072,7 +1072,7 @@ VerifiedBlockRef BlockChain::verifyBlock(bytes const& _block, function<void(Exce
try try
{ {
Strictness strictness = Strictness::CheckEverything; Strictness strictness = Strictness::CheckEverything;
if (_ir & ~ImportRequirements::ValidNonce) if (~_ir & ImportRequirements::ValidNonce)
strictness = Strictness::IgnoreNonce; strictness = Strictness::IgnoreNonce;
res.info.populate(_block, strictness); res.info.populate(_block, strictness);

Loading…
Cancel
Save