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

Fix the height to end with #88

Merged
merged 2 commits into from
Apr 23, 2019
Merged

Fix the height to end with #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78dcea4
Fix-heightToEnd
superboyiii Apr 23, 2019
47892e8
Minor fix and comment
vncoelho Apr 23, 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
6 changes: 3 additions & 3 deletions CoreMetrics/CoreMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private JObject GetBlocksTime(uint nBlocks, uint lastHeight)
if (nBlocks >= Blockchain.Singleton.Height)
{
JObject json = new JObject();
return json["error"] = "Requested number of blocks timestamps exceeds quantity of known blocks " + Blockchain.Singleton.Height;
return json["error"] = "Requested number of blocks timestamps " + nBlocks + " exceeds quantity of known blocks " + Blockchain.Singleton.Height;
}

if (nBlocks <= 0)
Expand All @@ -74,8 +74,8 @@ private JObject GetBlocksTime(uint nBlocks, uint lastHeight)
}

JArray array = new JArray();
uint heightToBegin = lastHeight > 0 ? lastHeight - nBlocks : Blockchain.Singleton.Height - nBlocks;
for (uint i = heightToBegin; i <= Blockchain.Singleton.HeaderHeight; i++)
uint heightToBegin = lastHeight > 0 ? lastHeight - nBlocks : (Blockchain.Singleton.Height - 1) - nBlocks;
for (uint i = heightToBegin; i <= heightToBegin + nBlocks; i++)
{
JObject json = new JObject();
Header header = Blockchain.Singleton.Store.GetHeader(i);
Copy link
Member

Choose a reason for hiding this comment

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

We must to check if is null

Copy link
Member

Choose a reason for hiding this comment

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

You mean Blockchain.Singleton.Height?

Copy link
Member

Choose a reason for hiding this comment

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

The header

Copy link
Member

Choose a reason for hiding this comment

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

That is true.
I do know when it will be null in practice, because we are checking the limit Blockchain.Singleton.HeaderHeight.
But looks like to be a protection. Let's add it in another PR if it really can happen.

Expand Down