Merge branch 'develop' into mk_jsonrpc

This commit is contained in:
Marek Kotewicz 2014-10-13 15:08:45 +02:00
commit 5723beb875

View File

@ -17,12 +17,12 @@
/** @file dagger.cpp /** @file dagger.cpp
* @author Gav Wood <i@gavwood.com> * @author Gav Wood <i@gavwood.com>
* @date 2014 * @date 2014
* Dagger test functions. * ProofOfWork test functions.
*/ */
#include <chrono> #include <chrono>
#include <libdevcore/Log.h> #include <libdevcore/Log.h>
#include <libethcore/Dagger.h> #include <libethcore/ProofOfWork.h>
using namespace std; using namespace std;
using namespace std::chrono; using namespace std::chrono;
using namespace dev; using namespace dev;
@ -30,20 +30,20 @@ using namespace dev::eth;
int daggerTest() int daggerTest()
{ {
cnote << "Testing Dagger..."; cnote << "Testing ProofOfWork...";
// Test dagger // Test dagger
{ {
auto s = steady_clock::now(); auto s = steady_clock::now();
cout << hex << Dagger().eval((h256)(u256)1, (h256)(u256)0); cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)0);
cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl; cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
cout << hex << Dagger().eval((h256)(u256)1, (h256)(u256)1); cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)1);
cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl; cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
} }
{ {
auto s = steady_clock::now(); auto s = steady_clock::now();
cout << hex << Dagger().eval((h256)(u256)1, (h256)(u256)0); cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)0);
cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl; cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
cout << hex << Dagger().eval((h256)(u256)1, (h256)(u256)1); cout << hex << ProofOfWork().eval((h256)(u256)1, (h256)(u256)1);
cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl; cout << " " << dec << duration_cast<milliseconds>(steady_clock::now() - s).count() << " ms" << endl;
} }
return 0; return 0;