d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

resolve merge conflict

Browse source
This commit is contained in:
wowario 2018-06-04 12:02:46 +03:00
parent ce1dd78f2d
commit c7795b223c
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/rpc/core_rpc_server.cpp
View file

@ -2102,18 +2102,12 @@ namespace cryptonote
{
res.distributions.push_back({amount, d.cached_start_height, d.cached_distribution, d.cached_base});
if (req.cumulative)
{
res.distributions.push_back({amount, slot.start_height, slot.distribution, slot.base});
found = true;
if (req.cumulative)
{
auto &distribution = res.distributions.back().distribution;
distribution[0] += slot.base;
distribution[0] += d.cached_base;
for (size_t n = 1; n < distribution.size(); ++n)
distribution[n] += distribution[n-1];
}
break;
}
continue;
}
@ -2125,6 +2119,13 @@ namespace cryptonote
{
res.distributions.push_back({amount, slot.start_height, slot.distribution, slot.base});
found = true;
if (req.cumulative)
{
auto &distribution = res.distributions.back().distribution;
distribution[0] += slot.base;
for (size_t n = 1; n < distribution.size(); ++n)
distribution[n] += distribution[n-1];
}
break;
}
}