Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cell on maxNBlocksPerDay (3.X) #142

Merged
merged 3 commits into from
Nov 13, 2019
Merged

Fix cell on maxNBlocksPerDay (3.X) #142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca29a29
Fix cell on maxNBlocksPerDay
superboyiii Nov 11, 2019
1da85a7
Delete incoverable code
superboyiii Nov 11, 2019
0da55cd
Fix nBlocks == 0
superboyiii Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions CoreMetrics/CoreMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void PostProcess(HttpContext context, string method, JArray _params, JObj
private JObject GetBlocksTime(uint nBlocks, uint lastHeight)
{
// It is currently limited to query blocks generated in the last 24hours (86400 seconds)
uint maxNBlocksPerDay = 86400 / Blockchain.MillisecondsPerBlock * 1000;
uint maxNBlocksPerDay = 86400 / (Blockchain.MillisecondsPerBlock / 1000);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

if (lastHeight != 0)
{
if (lastHeight >= Blockchain.Singleton.Height)
Expand All @@ -60,13 +60,13 @@ private JObject GetBlocksTime(uint nBlocks, uint lastHeight)
JObject json = new JObject();
return json["error"] = "Requested number of blocks timestamps " + nBlocks + " exceeds quantity of known blocks " + Blockchain.Singleton.Height;
}

if (nBlocks <= 0)
shargon marked this conversation as resolved.
Show resolved Hide resolved
if (nBlocks == 0)
{
JObject json = new JObject();
return json["error"] = "Requested number of block times can not be <= 0";
return json["error"] = "Requested number of block times can not be = 0";
}

JArray array = new JArray();
uint heightToBegin = lastHeight > 0 ? lastHeight - nBlocks : (Blockchain.Singleton.Height - 1) - nBlocks;
for (uint i = heightToBegin; i <= heightToBegin + nBlocks; i++)
Expand Down