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

10 years ago · 271b6a6771
2 changed files with 1 additions and 2 deletions
--- a/ethminer/MinerAux.h
+++ b/ethminer/MinerAux.h
@ -410,7 +410,6 @@ private:
 			}
 			catch (...)
 			{
-				cout << "Error phoning home. ET is sad." << endl;
 			}
 		}
 #endif
--- a/libethereum/BlockChain.cpp
+++ b/libethereum/BlockChain.cpp
@ -1072,7 +1072,7 @@ VerifiedBlockRef BlockChain::verifyBlock(bytes const& _block, function<void(Exce
 	try
 	{
 		Strictness strictness = Strictness::CheckEverything;
-		if (_ir & ~ImportRequirements::ValidNonce)
+		if (~_ir & ImportRequirements::ValidNonce)
 			strictness = Strictness::IgnoreNonce;

 		res.info.populate(_block, strictness);