diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-03-25 08:45:19 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-03-25 08:45:19 +0200 |
| commit | 46d4fd000cb86f96118bd9e228cfb58fb204e482 (patch) | |
| tree | 9942b11a421e8743b179f341ca28c39f08843a92 /src/cryptonote_core/difficulty.cpp | |
| parent | 40b8a5f327c9c7e79f436e3fd007995a6a439d04 (diff) | |
| parent | 01e0a69c175852adb01897431a138739faf39fe1 (diff) | |
| download | monzero-core-46d4fd000cb86f96118bd9e228cfb58fb204e482.tar.gz monzero-core-46d4fd000cb86f96118bd9e228cfb58fb204e482.tar.xz monzero-core-46d4fd000cb86f96118bd9e228cfb58fb204e482.zip | |
Merge pull request #761
01e0a69 Revert "Merge pull request #749" (Riccardo Spagni)
Diffstat (limited to 'src/cryptonote_core/difficulty.cpp')
| -rw-r--r-- | src/cryptonote_core/difficulty.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cryptonote_core/difficulty.cpp b/src/cryptonote_core/difficulty.cpp index 54da77392..236e84481 100644 --- a/src/cryptonote_core/difficulty.cpp +++ b/src/cryptonote_core/difficulty.cpp @@ -116,8 +116,8 @@ namespace cryptonote { return !carry; } - difficulty_type next_difficulty(std::vector<std::uint64_t> timestamps, std::vector<difficulty_type> cumulative_difficulties, size_t target_seconds) { - + difficulty_type next_difficulty(vector<uint64_t> timestamps, vector<difficulty_type> cumulative_difficulties, size_t target_seconds) { + //cutoff DIFFICULTY_LAG if(timestamps.size() > DIFFICULTY_WINDOW) { timestamps.resize(DIFFICULTY_WINDOW); @@ -151,8 +151,6 @@ namespace cryptonote { assert(total_work > 0); uint64_t low, high; mul(total_work, target_seconds, low, high); - // blockchain errors "difficulty overhead" if this function returns zero. - // TODO: consider throwing an exception instead if (high != 0 || low + time_span - 1 < low) { return 0; } |