From 354aac8d1c55d89c4b9fd85d6800416556d819f1 Mon Sep 17 00:00:00 2001
From: Nathan Marley <nathan.marley@gmail.com>
Date: Mon, 12 Feb 2018 04:46:01 -0800
Subject: [PATCH] rename nEpochStart variable and adjust comments (#1915)

* rename nEpochStart variable and adjust comments

* rename GetBlockStart() -> GetBlockHeight()

* change var name to nBlockHeight
---
 src/governance-classes.cpp | 22 +++++++++++-----------
 src/governance-classes.h   | 23 +++--------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/governance-classes.cpp b/src/governance-classes.cpp
index 1614fbbfc..b7581e0e1 100644
--- a/src/governance-classes.cpp
+++ b/src/governance-classes.cpp
@@ -196,7 +196,7 @@ void CGovernanceTriggerManager::CleanAndRemove()
             case SEEN_OBJECT_IS_VALID:
             case SEEN_OBJECT_EXECUTED:
                 {
-                    int nTriggerBlock = pSuperblock->GetBlockStart();
+                    int nTriggerBlock = pSuperblock->GetBlockHeight();
                     // Rough approximation: a cycle of superblock ++
                     int nExpirationBlock = nTriggerBlock + GOVERNANCE_TRIGGER_EXPIRATION_BLOCKS;
                     LogPrint("gobject", "CGovernanceTriggerManager::CleanAndRemove -- nTriggerBlock = %d, nExpirationBlock = %d\n", nTriggerBlock, nExpirationBlock);
@@ -312,13 +312,13 @@ bool CSuperblockManager::IsSuperblockTriggered(int nBlockHeight)
 
         // note : 12.1 - is epoch calculation correct?
 
-        if(nBlockHeight != pSuperblock->GetBlockStart()) {
+        if(nBlockHeight != pSuperblock->GetBlockHeight()) {
             LogPrint("gobject", "CSuperblockManager::IsSuperblockTriggered -- block height doesn't match nBlockHeight = %d, blockStart = %d, continuing\n",
                      nBlockHeight,
-                     pSuperblock->GetBlockStart());
+                     pSuperblock->GetBlockHeight());
             DBG( cout << "IsSuperblockTriggered Not the target block, continuing"
                  << ", nBlockHeight = " << nBlockHeight
-                 << ", superblock->GetBlockStart() = " << pSuperblock->GetBlockStart()
+                 << ", superblock->GetBlockHeight() = " << pSuperblock->GetBlockHeight()
                  << endl; );
             continue;
         }
@@ -365,7 +365,7 @@ bool CSuperblockManager::GetBestSuperblock(CSuperblock_sptr& pSuperblockRet, int
             continue;
         }
 
-        if(nBlockHeight != pSuperblock->GetBlockStart()) {
+        if(nBlockHeight != pSuperblock->GetBlockHeight()) {
             DBG( cout << "GetBestSuperblock Not the target block, continuing" << endl; );
             continue;
         }
@@ -463,7 +463,7 @@ bool CSuperblockManager::IsValid(const CTransaction& txNew, int nBlockHeight, CA
 CSuperblock::
 CSuperblock()
     : nGovObjHash(),
-      nEpochStart(0),
+      nBlockHeight(0),
       nStatus(SEEN_OBJECT_UNKNOWN),
       vecPayments()
 {}
@@ -471,7 +471,7 @@ CSuperblock()
 CSuperblock::
 CSuperblock(uint256& nHash)
     : nGovObjHash(nHash),
-      nEpochStart(0),
+      nBlockHeight(0),
       nStatus(SEEN_OBJECT_UNKNOWN),
       vecPayments()
 {
@@ -496,16 +496,16 @@ CSuperblock(uint256& nHash)
 
     UniValue obj = pGovObj->GetJSONObject();
 
-    // FIRST WE GET THE START EPOCH, THE DATE WHICH THE PAYMENT SHALL OCCUR
-    nEpochStart = obj["event_block_height"].get_int();
+    // FIRST WE GET THE START HEIGHT, THE BLOCK HEIGHT AT WHICH THE PAYMENT SHALL OCCUR
+    nBlockHeight = obj["event_block_height"].get_int();
 
     // NEXT WE GET THE PAYMENT INFORMATION AND RECONSTRUCT THE PAYMENT VECTOR
     std::string strAddresses = obj["payment_addresses"].get_str();
     std::string strAmounts = obj["payment_amounts"].get_str();
     ParsePaymentSchedule(strAddresses, strAmounts);
 
-    LogPrint("gobject", "CSuperblock -- nEpochStart = %d, strAddresses = %s, strAmounts = %s, vecPayments.size() = %d\n",
-             nEpochStart, strAddresses, strAmounts, vecPayments.size());
+    LogPrint("gobject", "CSuperblock -- nBlockHeight = %d, strAddresses = %s, strAmounts = %s, vecPayments.size() = %d\n",
+             nBlockHeight, strAddresses, strAmounts, vecPayments.size());
 
     DBG( cout << "CSuperblock Constructor End" << endl; );
 }
diff --git a/src/governance-classes.h b/src/governance-classes.h
index e74c583f8..ea577b61d 100644
--- a/src/governance-classes.h
+++ b/src/governance-classes.h
@@ -148,7 +148,7 @@ class CSuperblock : public CGovernanceObject
 private:
     uint256 nGovObjHash;
 
-    int nEpochStart;
+    int nBlockHeight;
     int nStatus;
     std::vector<CGovernancePayment> vecPayments;
 
@@ -177,26 +177,9 @@ public:
         return pObj;
     }
 
-    int GetBlockStart()
+    int GetBlockHeight()
     {
-        /* // 12.1 TRIGGER EXECUTION */
-        /* // NOTE : Is this over complicated? */
-
-        /* //int nRet = 0; */
-        /* int nTipEpoch = 0; */
-        /* int nTipBlock = chainActive.Tip()->nHeight+1; */
-
-        /* // GET TIP EPOCK / BLOCK */
-
-        /* // typically it should be more than the current time */
-        /* int nDiff = nEpochStart - nTipEpoch; */
-        /* int nBlockDiff = nDiff / (2.6*60); */
-
-        /* // calculate predicted block height */
-        /* int nMod = (nTipBlock + nBlockDiff) % Params().GetConsensus().nSuperblockCycle; */
-
-        /* return (nTipBlock + nBlockDiff)-nMod; */
-        return nEpochStart;
+        return nBlockHeight;
     }
 
     int CountPayments() { return (int)vecPayments.size(); }