From 555cb53c78ee475f32ed174779769877e4729ed4 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Sat, 27 Apr 2019 21:01:51 +0100
Subject: [PATCH] Improve totalKreditsEarned

* Use a more reasonable size of integer
* Use better variable names (count != amount, balance != count)
---
 apps/contribution/contracts/Contribution.sol | 8 ++++----
 apps/contributor/contracts/Contributor.sol   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/contribution/contracts/Contribution.sol b/apps/contribution/contracts/Contribution.sol
index b77c338..1cc78be 100644
--- a/apps/contribution/contracts/Contribution.sol
+++ b/apps/contribution/contracts/Contribution.sol
@@ -127,13 +127,13 @@ contract Contribution is AragonApp {
     }
   }
 
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count) {
-    uint256 tokenBalance = ownedContributions[contributorId].length;
-    for (uint256 i = 0; i < tokenBalance; i++) {
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount) {
+    uint256 tokenCount = ownedContributions[contributorId].length;
+    for (uint256 i = 0; i < tokenCount; i++) {
       uint32 cId = ownedContributions[contributorId][i];
       ContributionData memory c = contributions[cId];
       if (block.number >= c.confirmedAtBlock || !confirmedOnly) {
-        count += c.amount; // should use safemath
+        amount += c.amount; // should use safemath
       }
     }
   }
diff --git a/apps/contributor/contracts/Contributor.sol b/apps/contributor/contracts/Contributor.sol
index ccaeb01..0b595c1 100644
--- a/apps/contributor/contracts/Contributor.sol
+++ b/apps/contributor/contracts/Contributor.sol
@@ -7,7 +7,7 @@ interface ITokenBalance {
   function balanceOf(address contributorAccount) public view returns (uint256);
 }
 interface IContributionBalance {
-  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint256 count);
+  function totalKreditsEarnedByContributor(uint32 contributorId, bool confirmedOnly) public view returns (uint32 amount);
   function balanceOf(address owner) public view returns (uint256);
 }
 
@@ -128,7 +128,7 @@ contract Contributor is AragonApp {
     return contributors[id];
   }
 
-  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint256 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists ) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;